chore: Remove invalid change

unoplatform · Sep 29, 2022 · 5d6014d · 5d6014d
1 parent 88ea363
commit 5d6014d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
@@ -466,8 +466,6 @@
 			<Compile Include="$(IntermediateOutputPath)\uno.reload.cookie.g.cs" />
 		</ItemGroup>
 	</Target>
-<<<<<<< HEAD
-=======
 
 	<Target Name="_WPFIssue6792_RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile" Condition="'$(UnoUseWPFIssue6792Workaround)'=='true'">
 		<!-- Work around https://github.com/dotnet/wpf/issues/6792, remove for .NET 6.0.500 or later -->
@@ -478,5 +476,4 @@
 			<Analyzer Include="@(FilteredAnalyzer)" />
 		</ItemGroup>
 	</Target>
->>>>>>> 7fd50ce18fbc5e65b2a49c0f4f777d984b1e9d20
 </Project>