From 91e4d772831d145fb104d973758723277f5be190 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 12 May 2010 03:23:37 +0000 Subject: [PATCH] Somehow a tortoise 'conflict' got committed --- src/input.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/input.h b/src/input.h index 92cca970..7f3d2cb5 100644 --- a/src/input.h +++ b/src/input.h @@ -221,19 +221,12 @@ enum EMUCMD EMUCMD_MISC_TOGGLEFULLSCREEN, EMUCMD_TOOL_OPENRAMWATCH, EMUCMD_TOOL_OPENRAMSEARCH, -<<<<<<< .mine EMUCMD_TOOL_RAMSEARCHLT, EMUCMD_TOOL_RAMSEARCHGT, EMUCMD_TOOL_RAMSEARCHLTE, EMUCMD_TOOL_RAMSEARCHGTE, EMUCMD_TOOL_RAMSEARCHEQ, EMUCMD_TOOL_RAMSEARCHNE, -======= - EMUCMD_CHEAT_SEARCHEQ, - EMUCMD_CHEAT_SEARCHNE, - EMUCMD_CHEAT_SEARCHLT, - EMUCMD_CHEAT_SEARCHGT, ->>>>>>> .r1856 EMUCMD_MAX };