mirror of
https://github.com/AppleWin/AppleWin.git
synced 2024-06-08 01:29:42 +00:00
Fixed resource.h merge mistake
This commit is contained in:
parent
87a7485e80
commit
d97f77aaff
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user