fix merged conflicts

2017-04-15 05:34:50 +03:00 · 2017-04-15 05:34:50 +03:00 · 0951668a46
parent 20643d4d34
commit 0951668a46
1 changed files with 1 additions and 0 deletions
--- a/arch/X86/X86DisassemblerDecoder.c
+++ b/arch/X86/X86DisassemblerDecoder.c
@ -2388,3 +2388,4 @@ int decodeInstruction(struct InternalInstruction *insn,
 }

 #endif
+