11

2026-04-04 19:41:27 +08:00
parent f828ad7ac5 15b3c87ac1
commit 0c7336abb4
14 changed files with 200 additions and 90 deletions
@@ -17017,7 +17017,11 @@
    </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}">