From 41c83fa0c0d53e90540c190fe8eacf3177e780f6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 08 十二月 2025 12:31:02 +0800
Subject: [PATCH] 1
---
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml
index 4902e25..9b18293 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml
@@ -4,15 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
-<<<<<<< HEAD
- <DeleteExistingFiles>False</DeleteExistingFiles>
- <ExcludeApp_Data>False</ExcludeApp_Data>
- <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
- <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
- <LastUsedPlatform>Any CPU</LastUsedPlatform>
- <PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</PublishUrl>
-=======
+
<DeleteExistingFiles>True</DeleteExistingFiles>
<ExcludeApp_Data>True</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
@@ -20,7 +12,7 @@
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
->>>>>>> 859d5fb0665d48215793ecd8b07b114a3e66b7f1
+
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1