merged from master

9 years ago · d2f8a0b65f
parent 87dbb05d3e
commit d2f8a0b65f
1 changed files with 0 additions and 3 deletions
--- 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