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_x86_32_gdt_and_seg_regs.c
+++ b/samples/sample_x86_32_gdt_and_seg_regs.c
@ -20,18 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

 #include <unicorn/unicorn.h>
-<<<<<<< HEAD
-=======
-#include <assert.h>
->>>>>>> unicorn-engine/msvc
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-<<<<<<< HEAD
-#
-=======

->>>>>>> unicorn-engine/msvc
 #pragma pack(push, 1)
 struct SegmentDescriptor {
   union {