tabs api update

microsoft · Feb 7, 2022 · 0b8c83e · 0b8c83e
1 parent 1dfd070
commit 0b8c83e
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/packages/react-tabs/etc/react-tabs.api.md b/packages/react-tabs/etc/react-tabs.api.md
@@ -107,11 +107,7 @@ export type TabListState = ComponentState<Required<TabListSlots>> & TabListConte
 };
 
 // @public
-<<<<<<< HEAD
-export type TabProps = ComponentProps<TabSlots> & TabCommonsUnstable;
-=======
-export type TabProps = ComponentProps<Partial<TabSlots>> & TabCommons;
->>>>>>> master
+export type TabProps = ComponentProps<Partial<TabSlots>> & TabCommonsUnstable;
 
 // @public (undocumented)
 export type TabSlots = {