From 0951668a464463c007b0adada5bcd430cf07ad63 Mon Sep 17 00:00:00 2001
From: el2ro <sami.torola@gmail.com>
Date: Sat, 15 Apr 2017 05:34:50 +0300
Subject: [PATCH] fix merged conflicts

---
 arch/X86/X86DisassemblerDecoder.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/X86/X86DisassemblerDecoder.c b/arch/X86/X86DisassemblerDecoder.c
index 5e87391a..a74357f1 100644
--- a/arch/X86/X86DisassemblerDecoder.c
+++ b/arch/X86/X86DisassemblerDecoder.c
@@ -2388,3 +2388,4 @@ int decodeInstruction(struct InternalInstruction *insn,
 }
 
 #endif
+