From fbb8392d06677c8eccabe03ecf3feddd349175ce Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 02:15:38 +0800
Subject: [PATCH] sovle conflict
---
MDK-ARM/F030C8T6_Test2.uvoptx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/MDK-ARM/F030C8T6_Test2.uvoptx b/MDK-ARM/F030C8T6_Test2.uvoptx
index 1a589aa..aa997f1 100644
--- a/MDK-ARM/F030C8T6_Test2.uvoptx
+++ b/MDK-ARM/F030C8T6_Test2.uvoptx
@@ -118,7 +118,9 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name>H姒�
`顕晇H姒�
</Name>
+ <Name>H姒�
+`顕晇H姒�
+</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
--
Gitblit v1.9.1