From 1ce20e2705882239b153551ab0d8f8cf132b07fa Mon Sep 17 00:00:00 2001
From: seshukm <seshu.kumar.m@huawei.com>
Date: Thu, 7 May 2020 16:39:24 +0530
Subject: [PATCH] bump the SO version

Issue-ID: SO-2775

Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: I335e4b123ec71376e01f041186131ea3bb923d9a
---
 version.properties | 6 +-----
 1 file changed, 1 insertion(+), 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}
 
-- 
2.16.6