chore: Adjust for backport

unoplatform · Sep 26, 2024 · ff2629a · ff2629a
1 parent 241f2db
commit ff2629a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 97 deletions.
diff --git a/src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj b/src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj
diff --git a/src/Uno.Sdk/targets/Uno.Common.Wasm.targets b/src/Uno.Sdk/targets/Uno.Common.Wasm.targets
@@ -26,12 +26,6 @@
 	<ItemGroup>
 		<SupportedPlatform Remove="@(SupportedPlatform)" />
 		<SupportedPlatform Include="browserwasm" />
-<<<<<<< HEAD
-=======
-
-		<!-- net9.0 validation of CA1418 is case sensitive -->
-		<SupportedPlatform Include="BrowserWasm" />
->>>>>>> b2062476a3 (fix: Ensure wwwroot assets are copied properly)
 		<SdkSupportedTargetPlatformVersion Include="$(TargetPlatformVersion)" />
 	</ItemGroup>