diff options
Diffstat (limited to 'version.properties')
| -rw-r--r-- | version.properties | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/version.properties b/version.properties index 248a45d8a7..922c4fa961 100644 --- a/version.properties +++ b/version.properties @@ -3,12 +3,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -<<<<<<< HEAD (cd5d60 Docker file for NSSMF-ADAPTER) minor=6 -======= -minor=7 ->>>>>>> CHANGE (7192a4 update the arch diag for the F release) -patch=0 +patch=1 base_version=${major}.${minor}.${patch} |