From d2f8a0b65fb1f9c02bd3668c076e2957d213b4ea Mon Sep 17 00:00:00 2001
From: Gerolf Ziegenhain <g@ziegenhain.com>
Date: Sun, 4 Jan 2015 14:43:50 +0100
Subject: [PATCH] merged from master

---
 src/irmc.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/irmc.c b/src/irmc.c
index cf312ec..0e0f1dc 100644
--- a/src/irmc.c
+++ b/src/irmc.c
@@ -31,10 +31,7 @@
 #include <mach/mach.h>
 #endif
  
-<<<<<<< HEAD:irmc.c
-=======
 #define DEBUG 0
->>>>>>> master:src/irmc.c
 
 #define MAXDATASIZE 1024 // max number of bytes we can get at once