fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

 MTerm1/Resource.h

@@ -77,6 +77,7 @@
#define IDD_DIALOGBAR                   351

#define IDD_DIALOGBAR_INPUT_SHOW        351

#define IDD_PROP_OUTPUT_MAPPING         352

#define IDD_FORM_INPUTSHOW              353

#define IDC_EDIT1                       1000

#define IDC_BUTTON1                     1001

#define IDC_BUTTON_LOAD                 1001

@@ -640,7 +641,55 @@
#define ID_BUTTON33086                  33086

#define ID_33088                        33088

#define ID_MENU_SHOW_DEV                33089

#define IDS_STRING101                   33101

#define ID_33091                        33091

#define ID_SHOW_LOG                     33092

#define ID_33093                        33093

#define ID_MENU_SHOWNAV                 33094

#define IDS_STRING101                   33100

#define IDC_BUTTON_AND                  33101

#define IDC_BUTTON_OR                   33102

#define IDC_BUTTON_VLINE                33103

#define IDC_BUTTON_OUT                  33104

#define IDC_BUTTON_TMCT                 33105

#define IDC_BUTTON_FUN                  33106

#define IDC_BUTTON_HLINE                33107

#define IDC_BUTTON_NOT                  33108

#define IDC_BUTTON_INDEX                33109

#define IDC_BUTTON_MC                   33110

#define IDC_BUTTON_MCE                  33111

#define IDC_BUTTON_E                    33183

#define IDC_BUTTON_SET                  33201

#define IDC_BUTTON_RESET                33202

#define IDC_BUTTON_DF                   33203

#define IDC_BUTTON_END                  33204

#define IDC_BUTTON_COMPARE              33205

#define IDC_BUTTON_PFUN                 33206

#define IDC_BUTTON_UPDOWN               33207

#define IDC_BUTTON_BIT                  33208

#define IDC_BUTTON_WORD                 33209

#define IDC_BUTTON_INSTRUCTION1         33210

#define IDC_BUTTON_INSTRUCTION2         33211

#define IDC_BUTTON_PGCONVERT            33301

#define IDC_BUTTON_ONLINE               33302

#define IDC_BUTTON_OFFLINE              33303

#define IDC_BUTTON_COLSE                33304

#define IDC_BUTTON_FIND                 33305

#define IDC_BUTTON_NEXTWIN              33306

#define IDC_BUTTON_MONITOR              33307

#define IDC_BUTTON_STATUS               33308

#define IDC_BUTTON_RUNPROG              33309

#define IDC_BUTTON_PLCREAD              33310

#define IDC_BUTTON_PLCWRITE             33311

#define IDC_BUTTON_X                    33401

#define IDC_BUTTON_Y                    33402

#define IDC_BUTTON_R                    33403

#define IDC_BUTTON_L                    33404

#define IDC_BUTTON_P                    33405

#define IDC_BUTTON_COMPARE1             33406

#define IDC_BUTTON_NOT1                 33408

#define IDC_BUTTON_T                    33501

#define IDC_BUTTON_C                    33502

#define ID_KEY_X                        33095

#define ID_INDICATOR_SEL_TYPE           59135

#define ID_INDICATOR_MACHINE_TYPE       59142

#define ID_INDICATOR_PROGRAM_POS        59143

@@ -655,7 +704,7 @@
#ifdef APSTUDIO_INVOKED

#ifndef APSTUDIO_READONLY_SYMBOLS

#define _APS_NEXT_RESOURCE_VALUE        359

#define _APS_NEXT_COMMAND_VALUE         33091

#define _APS_NEXT_COMMAND_VALUE         33185

#define _APS_NEXT_CONTROL_VALUE         1087

#define _APS_NEXT_SYMED_VALUE           319

#endif