diff options
Diffstat (limited to 'version.properties')
| -rw-r--r-- | version.properties | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/version.properties b/version.properties index a0756adf2b..248a45d8a7 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,11 @@ # 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 base_version=${major}.${minor}.${patch} |