From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
.idea/misc.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 360e6d4..5895a79 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,4 +7,11 @@
<component name="ProjectType">
<option name="id" value="Android" />
</component>
+ <component name="VisualizationToolProject">
+ <option name="state">
+ <ProjectState>
+ <option name="scale" value="0.152" />
+ </ProjectState>
+ </option>
+ </component>
</project>
\ No newline at end of file
--
Gitblit v1.9.1