diff --git a/urdme/src/read_matfile.c b/urdme/src/read_matfile.c index 8e05194d..fd0157cd 100644 --- a/urdme/src/read_matfile.c +++ b/urdme/src/read_matfile.c @@ -8,11 +8,7 @@ extern int errno; #include #include #include -<<<<<<< HEAD -/*#include "zlib.h" // support for compression (-v7 files) */ -======= /*#include "zlib.h" // support for compression (-v7 files) */ ->>>>>>> 768e62bfd47f9960f0f7b35d572813ce27134f50 #include #include "read_matfile.h" //**************************************************************************************