From 5d6014dc0053872a1dd09cbcc81d75628cb38a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Thu, 29 Sep 2022 13:17:59 -0400
Subject: [PATCH] chore: Remove invalid change

---
 .../Content/Uno.UI.SourceGenerators.props                      | 3 ---
 1 file changed, 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
index 438c90c2ca9c..c9f2f9d70a8b 100644
--- 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>