From 147e1dbeb10d287dd256eb7b0d61feda8a259ec5 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期五, 23 一月 2026 09:22:30 +0800
Subject: [PATCH] 1
---
WebAPI/WebAPI.csproj.user | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 116b00c..96ed1a2 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,13 +9,8 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
-<<<<<<< HEAD
- <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile6.pubxml</NameOfLastUsedPublishProfile>
-=======
<NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
->>>>>>> dbb4487be15ef158326d46bb81b6284987e35a2c
</PropertyGroup>
<ProjectExtensions />
</Project>
\ No newline at end of file
--
Gitblit v1.9.1