From 70315a3da87179e9cc4615987f494f63422d6b2d Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Sat, 4 Apr 2026 19:44:04 +0800
Subject: [PATCH] 111

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index c3615012..d98a37e8 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -17017,11 +17017,10 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-<<<<<<< HEAD
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
-=======
+  
+ 
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
->>>>>>> 15b3c87ac1c4cf4a496def63cba87a1de5c899b2
+ 
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">