From eea4876ec29dbf26fe4fb2949bc156d12136804e Mon Sep 17 00:00:00 2001
From: seshukm <seshu.kumar.m@huawei.com>
Date: Wed, 15 Apr 2020 13:44:29 +0530
Subject: update the arch diag for the F release

Issue-ID: SO-2730

Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: Ic6fe2e0fd824007bc0cbb55eaf1f105794b394dc
---
 version.properties | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'version.properties')

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}
-- 
cgit 1.2.3-korg