fix bad merge

microsoft · Aug 22, 2023 · 7e73dc5 · 7e73dc5
1 parent 7cbf4d6
commit 7e73dc5
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/dev/TabView/APITests/TabViewTests.cs b/dev/TabView/APITests/TabViewTests.cs
@@ -211,9 +211,6 @@ static ISelectionItemProvider GetProviderFromTVI(TabViewItem item)
         }
 
         [TestMethod]
-<<<<<<< HEAD
-        public void VerifyTabViewWithoutTabsDoesNotCrash()
-=======
         public void VerifyPaneFooterSizingRespected()
         {
             foreach (var property in new DependencyProperty[] { FrameworkElement.MinWidthProperty, FrameworkElement.WidthProperty })
@@ -264,8 +261,7 @@ public void VerifyPaneFooterSizingRespected()
 
 
 
-        private static void VerifyTabWidthVisualStates(IList<object> items, bool isCompact)
->>>>>>> 6e77244d (Add test)
+        private void VerifyTabViewWithoutTabsDoesNotCrash()
         {
             RunOnUIThread.Execute(() =>
             {