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

diff --git a/MTerm1/MTerm1.rc b/MTerm1/MTerm1.rc
index 2806d7f..b52d0d0 100644
--- a/MTerm1/MTerm1.rc
+++ b/MTerm1/MTerm1.rc
Binary files differ

--
Gitblit v1.9.1