From d97f77aaff60f61ed393c7ef6744b8aeca0a1a2c Mon Sep 17 00:00:00 2001 From: pedgarcia Date: Wed, 1 Oct 2014 19:32:19 -0400 Subject: [PATCH] Fixed resource.h merge mistake --- resource/resource.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resource/resource.h b/resource/resource.h index f9a8f589..15573251 100644 --- a/resource/resource.h +++ b/resource/resource.h @@ -128,11 +128,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 147 #define _APS_NEXT_COMMAND_VALUE 40012 -<<<<<<< HEAD #define _APS_NEXT_CONTROL_VALUE 1082 -======= -#define _APS_NEXT_CONTROL_VALUE 1080 ->>>>>>> d9e37e007c26236870ebc635c22e944d2d271d6e #define _APS_NEXT_SYMED_VALUE 101 #endif #endif