From 74527112d4546922da9ed673e0aef89160f9f6d1 Mon Sep 17 00:00:00 2001
From: Andreas Hellander <andreash@nl119-180-230.student.uu.se>
Date: Wed, 9 Oct 2013 13:51:55 +0200
Subject: [PATCH] Bumped version number

---
 urdme/src/read_matfile.c | 4 ----
 1 file changed, 4 deletions(-)

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 <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"
 //**************************************************************************************