Fixed some conflicts

2017-01-23 11:35:00 +11:00
parent 19a6dc948f
commit cbd0e6056c
11 changed files with 0 additions and 217 deletions
--- a/samples/sample_batch_reg.c
+++ b/samples/sample_batch_reg.c
@ -1,9 +1,3 @@
-<<<<<<< HEAD
-
-=======
-#include <stdio.h>
-#include <string.h>
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 #include <stdio.h>