Merge pull request #96 from contentful/fixed-typings

fix(Typings): Fix index.d.ts exports
contentful · Feb 19, 2019 · 134ca78 · 134ca78
2 parents f9c16f0 + 38cc51b
commit 134ca78
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/packages/forma-36-react-components/index.d.ts b/packages/forma-36-react-components/index.d.ts
@@ -91,13 +91,10 @@ export const FieldGroup: typeof FieldGroupComponent;
 export const Form: typeof FormComponent;
 export const Modal: typeof ModalComponent;
 export const ModalConfirm: typeof ModalConfirmComponent;
-<<<<<<< HEAD
 export const Notification: typeof NotificationAPI;
-=======
 export const Tabs: typeof TabsComponent;
 export const Tab: typeof TabComponent;
 export const TabPanel: typeof TabPanelComponent;
->>>>>>> feat(Tabs): Created Tabs component
 
 export interface CopyButtonProps {
   extraClassNames?: string;