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/MyFormInputShow.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/MTerm1/MyFormInputShow.h b/MTerm1/MyFormInputShow.h
index 596c372..3c61b36 100644
--- a/MTerm1/MyFormInputShow.h
+++ b/MTerm1/MyFormInputShow.h
@@ -269,6 +269,7 @@
 	afx_msg void OnHotkeyY();
 	afx_msg void OnHotkeyDelete();
 	afx_msg void OnHotkeyInsert();
+	afx_msg void OnKeyX();
 };
 
 

--
Gitblit v1.9.1