111

2026-04-04 19:44:04 +08:00 · 2026-04-04 19:44:04 +08:00 · 70315a3da8
parent 0c7336abb4
commit 70315a3da8
1 changed files with 3 additions and 4 deletions
--- 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}">