From f04e2b1dac8f950376652c5a1dd8df6055af8fd0 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.uvguix.QuakeGod | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/MDK-ARM/F030C8T6_Test2.uvguix.QuakeGod b/MDK-ARM/F030C8T6_Test2.uvguix.QuakeGod
index cd5c1be..94b606c 100644
--- a/MDK-ARM/F030C8T6_Test2.uvguix.QuakeGod
+++ b/MDK-ARM/F030C8T6_Test2.uvguix.QuakeGod
@@ -105,8 +105,8 @@
<sActiveDebugView></sActiveDebugView>
<WindowPosition>
<length>44</length>
- <flags>2</flags>
- <showCmd>3</showCmd>
+ <flags>0</flags>
+ <showCmd>1</showCmd>
<MinPosition>
<xPos>-1</xPos>
<yPos>-1</yPos>
@@ -149,7 +149,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>F40000006600000090050000F6000000</Data>
+ <Data>F5000000880000009105000018010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -3621,6 +3621,10 @@
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
+ </MDIGroup>
+ <MDIGroup>
+ <Size>63</Size>
+ <ActiveTab>0</ActiveTab>
<Doc>
<Name>../Inc/stm32f0xx_it.h</Name>
<ColumnNumber>0</ColumnNumber>
--
Gitblit v1.9.1