From 959334a57faf1fae6a4c0fe6caaf64502458737c Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 24 二月 2021 10:21:18 +0800
Subject: [PATCH] 1.1
---
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 6d9dbb1..1fe1c5b 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -157,17 +157,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
-<<<<<<< HEAD
- <publishTime>02/22/2021 09:56:46</publishTime>
+ <publishTime>02/22/2021 22:22:40</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/22/2021 09:56:46</publishTime>
-=======
- <publishTime>02/21/2021 11:56:27</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>
@@ -341,11 +334,7 @@
<publishTime>02/22/2021 09:23:05</publishTime>
</File>
<File Include="Web.config">
-<<<<<<< HEAD
- <publishTime>02/22/2021 09:57:03</publishTime>
-=======
- <publishTime>02/21/2021 12:21:03</publishTime>
->>>>>>> parent of 9ba27cd (nothing)
+ <publishTime>02/22/2021 22:22:51</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1