From 6fa60de2b0d0237054aa7571191df0f291838031 Mon Sep 17 00:00:00 2001
From: QuakeGod <quakegod@sina.com>
Date: 星期五, 20 十月 2023 22:27:53 +0800
Subject: [PATCH] fix conflict

---
 MTerm1/Resource.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/MTerm1/Resource.h b/MTerm1/Resource.h
index fb6ffd7..2c29b08 100644
--- a/MTerm1/Resource.h
+++ b/MTerm1/Resource.h
@@ -689,6 +689,7 @@
 #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

--
Gitblit v1.9.1