chore: Adjust for backport

unoplatform · Jul 10, 2024 · 867e054 · 867e054
1 parent ce7ae89
commit 867e054
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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
 		}