From 910028f450662294ff7ea7de5894a42010416ad7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 26 八月 2024 17:28:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
index 8d164d4..f063768 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
@@ -4,13 +4,21 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
+<<<<<<< HEAD
+ <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
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1