Merged mkconfig from master.

2016-01-13 11:18:56 +00:00
parent 73d5d950ea 684639b9e2
commit f32fa39117
1 changed files with 0 additions and 4 deletions
--- a/mkconfig.bash
+++ b/mkconfig.bash
@@ -23,11 +23,7 @@
 ###########################################################################

 # 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'