From 4c2d6fc7aeb7fe0cc44b2735514d47ff2ace18fa Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 19 一月 2026 16:06:25 +0800
Subject: [PATCH] 1

---
 WebAPI/Properties/PublishProfiles/WTTFolder.pubxml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
similarity index 74%
rename from WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
rename to WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
index cabad0c..8316d46 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
+++ b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD:WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
+锘�<?xml version="1.0" encoding="utf-8"?>
+=======
 <?xml version="1.0" encoding="utf-8"?>
+>>>>>>> 6367b170a3db4df6e43a8962b2f17b06a020b913:WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
 <!--
 https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->

--
Gitblit v1.9.1