Bumped version number

URDME · Oct 9, 2013 · c252c97 · c252c97
2 parents 607cf97 + 768e62b
commit c252c97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.1
+1.2.1
diff --git a/urdme/src/read_matfile.c b/urdme/src/read_matfile.c
@@ -8,7 +8,11 @@ extern int errno;
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+<<<<<<< HEAD
 /*#include "zlib.h" // support for compression (-v7 files) */
+=======
+/*#include "zlib.h"  // support for compression (-v7 files) */
+>>>>>>> 768e62bfd47f9960f0f7b35d572813ce27134f50
 #include <time.h>
 #include "read_matfile.h"
 //**************************************************************************************