From: seshukm <seshu.kumar.m@huawei.com>
Date: Wed, 15 Apr 2020 08:14:29 +0000 (+0530)
Subject: update the arch diag for the F release
X-Git-Tag: 1.6.1~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F106899%2F1;p=so.git

update the arch diag for the F release

Issue-ID: SO-2730

Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: Ic6fe2e0fd824007bc0cbb55eaf1f105794b394dc
---

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}