From bd2a851cd8318f4c14c69f49430acbda5a1bd846 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 24 二月 2021 10:22:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/YqnApi
---
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 9b4ea3b..d5d9e59 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -157,14 +157,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>02/22/2021 03:20:59</publishTime>
+ <publishTime>02/22/2021 22:22:40</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/22/2021 03:20:59</publishTime>
- </File>
- <File Include="bin/WebAPI.pdb">
- <publishTime>02/21/2021 11:56:27</publishTime>
->>>>>>> parent of 9ba27cd (nothing)
+ <publishTime>02/22/2021 22:22:40</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -338,7 +334,7 @@
<publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/22/2021 03:21:33</publishTime>
+ <publishTime>02/22/2021 22:22:51</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1