From 6d414acbe4cd1af3fe8b20bc3e0749a82d25e671 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 13 一月 2026 09:41:10 +0800
Subject: [PATCH] 1
---
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
index 807d98f..b079bd3 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
@@ -1,3 +1,11 @@
+<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+姝ゆ枃浠剁敱 Web 椤圭洰鐨勫彂甯�/鎵撳寘杩囩▼浣跨敤銆傚彲浠ラ�氳繃缂栬緫姝� MSBuild 鏂囦欢
+鑷畾涔夋杩囩▼鐨勮涓恒�備负浜嗚В涓庢鐩稿叧鐨勬洿澶氬唴瀹癸紝璇疯闂� https://go.microsoft.com/fwlink/?LinkID=208121銆�
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+=======
锘�<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
@@ -13,4 +21,5 @@
<PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
+>>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
</Project>
\ No newline at end of file
--
Gitblit v1.9.1