Bumped version number

URDME · Oct 9, 2013 · 7452711 · 7452711
1 parent c252c97
commit 7452711
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/urdme/src/read_matfile.c b/urdme/src/read_matfile.c
@@ -8,11 +8,7 @@ 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"
 //**************************************************************************************