From 61ec554e4da9d87519d568350ed7dcba441b8326 Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期一, 26 八月 2024 15:20:16 +0800
Subject: [PATCH] 11
---
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index 87c870f..9888479 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -4,6 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
+<<<<<<< HEAD
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
<History>True|2024-08-26T07:01:15.1678813Z;True|2024-08-26T14:58:26.9690997+08:00;True|2024-08-26T14:54:35.5794054+08:00;True|2024-08-26T14:32:03.8719422+08:00;False|2024-08-26T14:31:43.2800075+08:00;True|2024-08-23T14:37:38.1141512+08:00;</History>
</PropertyGroup>
@@ -492,4 +493,8 @@
<publishTime>08/23/2024 14:37:34</publishTime>
</File>
</ItemGroup>
+=======
+ <History>False|2024-08-26T01:46:23.8837034Z;False|2024-08-26T09:42:50.5108789+08:00;False|2024-08-26T09:33:16.5156645+08:00;False|2024-08-26T09:31:17.8659550+08:00;False|2024-08-26T09:30:43.9441152+08:00;False|2024-08-26T08:57:22.1073145+08:00;False|2024-08-26T08:56:38.8704796+08:00;</History>
+ </PropertyGroup>
+>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
</Project>
\ No newline at end of file
--
Gitblit v1.9.1