From cd8e9893da7b3626e223cfb98d0769aaa73e5cbb Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 31 十二月 2024 16:04:16 +0800
Subject: [PATCH] 1
---
WebAPI/WebAPI.csproj.user | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 09aa3a5..be6507d 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -2,11 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
-<<<<<<< HEAD
- <NameOfLastUsedPublishProfile>E:\鏅轰簯mes\mes\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile9.pubxml</NameOfLastUsedPublishProfile>
-=======
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
->>>>>>> 7d2677241200a3a1fd110e5d37864571c6d87f67
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
--
Gitblit v1.9.1