Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-08-14 11:25:43 +00:00
Code Issues Projects Releases Wiki Activity

Fixed resource.h merge mistake

Browse Source
This commit is contained in:
pedgarcia
2014-10-01 19:32:19 -04:00
parent 87a7485e80
commit d97f77aaff
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resource/resource.h
View File

@@ -128,11 +128,7 @@
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 147 #define _APS_NEXT_RESOURCE_VALUE 147
#define _APS_NEXT_COMMAND_VALUE 40012 #define _APS_NEXT_COMMAND_VALUE 40012
<<<<<<< HEAD
#define _APS_NEXT_CONTROL_VALUE 1082 #define _APS_NEXT_CONTROL_VALUE 1082
=======
#define _APS_NEXT_CONTROL_VALUE 1080
>>>>>>> d9e37e007c26236870ebc635c22e944d2d271d6e
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif