Merge branch 'master' of https://github.com/Exo7/DCS_BIOS-M2000C_Library

Exo7 · Nov 6, 2017 · 1df308e · 1df308e
2 parents cf17534 + ca96d1d
commit 1df308e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/DCS-BIOS/lib/M2000C.lua b/DCS-BIOS/lib/M2000C.lua
@@ -8,7 +8,11 @@
 --     LIBRARY     	:    Mirage 2000C RAZBAM
 --     CONTIBUTORS 	:    Exo7, Ergo 
 --     LINK        	:    https://github.com/Exo7/DCS_BIOS-M2000C_Library/releases/latest
+<<<<<<< HEAD
 --     VERSION     	:    v1.19
+=======
+--     VERSION     	:    v1.18
+>>>>>>> ca96d1d03512578d4b7afe48b800af6207b9ec27
 --
 -----------------------------------------------------------
 -- Release log :