From 47b45a4ac3284936515a2edd3e50265de30993a0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 04 六月 2025 14:50:23 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
index f063768..b728def 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
@@ -4,21 +4,18 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
-<<<<<<< HEAD
- <DeleteExistingFiles>False</DeleteExistingFiles>
-=======
+
+ <!-- <DeleteExistingFiles>False</DeleteExistingFiles> -->
<DeleteExistingFiles>True</DeleteExistingFiles>
->>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
+
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
-<<<<<<< HEAD
+
<PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
-=======
- <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
->>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
+ <!-- <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl> -->
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1