neon: fix merge error

diff --git a/orc/orcprogram.h b/orc/orcprogram.h
index 393d67b..086b7de 100644 (file)
--- a/orc/orcprogram.h
+++ b/orc/orcprogram.h
@@ -352,10 +352,7 @@ struct _OrcCompiler {
   int exec_reg;
   int gp_tmpreg;
 
-<<<<<<< HEAD:orc/orcprogram.h
   int insn_index;
-=======
->>>>>>> master:orc/orcprogram.h
   int need_mask_regs;
 };