summaryrefslogtreecommitdiffstats
path: root/version.properties
diff options
context:
space:
mode:
authorseshukm <seshu.kumar.m@huawei.com>2020-04-15 13:44:29 +0530
committerSeshu Kumar M <seshu.kumar.m@huawei.com>2020-04-30 13:35:43 +0000
commiteea4876ec29dbf26fe4fb2949bc156d12136804e (patch)
tree7787ed619dd9a4106c5318402de7619fefba6b85 /version.properties
parentcd5d6025b12a0ff3e4fa76e1ee8b8ee290fbc2f3 (diff)
update the arch diag for the F release
Issue-ID: SO-2730 Signed-off-by: seshukm <seshu.kumar.m@huawei.com> Change-Id: Ic6fe2e0fd824007bc0cbb55eaf1f105794b394dc
Diffstat (limited to 'version.properties')
-rw-r--r--version.properties4
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}