From b6290b94cac76a5634cd90b495b65d91ee92d85e Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 22 二月 2023 08:57:38 +0800
Subject: [PATCH] fix conflict

---
 MDK-ARM/pemicro_connection_settings.ini |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/MDK-ARM/pemicro_connection_settings.ini b/MDK-ARM/pemicro_connection_settings.ini
new file mode 100644
index 0000000..1fe1c3b
--- /dev/null
+++ b/MDK-ARM/pemicro_connection_settings.ini
@@ -0,0 +1,3 @@
+[STARTUP]
+CPUTARGETTYPENAME=
+

--
Gitblit v1.9.1