From 2ba3961bc3264a4af46e10cd199cdbe498593174 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期日, 22 三月 2026 14:09:03 +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 66c0191..961367b 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -2,11 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
-<<<<<<< HEAD
-    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
-=======
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
->>>>>>> f510c6405f7854fa0ab6bf92e72ea15dde056f4c
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

--
Gitblit v1.9.1