From fefe950223d390ce9bd54fd1d412b8ef7db11056 Mon Sep 17 00:00:00 2001
From: Ricardo Martins <rasm@oceanscan-mst.com>
Date: Tue, 3 Nov 2015 13:11:08 +0000
Subject: [PATCH] mkconfig: added necsave suffix.

---
 mkconfig.bash | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mkconfig.bash b/mkconfig.bash
index c872cf9..e33e62c 100755
--- a/mkconfig.bash
+++ b/mkconfig.bash
@@ -23,7 +23,11 @@
 ###########################################################################
 
 # Config: GLUED version.
+<<<<<<< HEAD
 cfg_glued_version='2015.12-rc1'
+=======
+cfg_glued_version='1.12.x-necsave'
+>>>>>>> mkconfig: added necsave suffix.
 # Config: GLUED vendor.
 cfg_glued_vendor='lsts'