From 867e054b4101f374a402dc51d3e66d0255b484d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Wed, 10 Jul 2024 13:03:00 -0400
Subject: [PATCH] chore: Adjust for backport

---
 src/SamplesApp/SamplesApp.Shared/App.xaml.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/SamplesApp/SamplesApp.Shared/App.xaml.cs b/src/SamplesApp/SamplesApp.Shared/App.xaml.cs
index 7b0c40fa4e83..fc239f319e87 100644
--- a/src/SamplesApp/SamplesApp.Shared/App.xaml.cs
+++ b/src/SamplesApp/SamplesApp.Shared/App.xaml.cs
@@ -528,12 +528,7 @@ static void ConfigureFeatureFlags()
 #endif
 #if HAS_UNO
 			Uno.UI.FeatureConfiguration.TextBox.UseOverlayOnSkia = false;
-<<<<<<< HEAD
-=======
-			Uno.UI.FeatureConfiguration.ToolTip.UseToolTips = true;
-
 			Uno.UI.FeatureConfiguration.Font.DefaultTextFontFamily = "ms-appx:///Uno.Fonts.OpenSans/Fonts/OpenSans.ttf";
->>>>>>> e9a3ded327 (chore: Switch SamplesApp)
 #endif
 		}