From de344cadaa299a585d20488c4ce393f7ec797461 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:05:13 +0800
Subject: [PATCH] 2021-02-05 10:04:48
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 7c93c2e..12637fb 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -15,6 +15,11 @@
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
+<<<<<<< HEAD
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="References" expanded="True">
+ <Node name="EZSDK.IOS" selected="True" />
+=======
<Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
<Node name="Server" expanded="True">
@@ -24,9 +29,9 @@
<Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
<Node name="UI1-Login" expanded="True" />
+>>>>>>> parent of bbb4e590... 2021-02-05 1.鍘绘帀娴嬭瘯浠ｇ爜
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
--
Gitblit v1.8.0