From 9b86ac637fc8d3f50598eb453a1bad39eddf1e4c Mon Sep 17 00:00:00 2001 From: Ibby Hadeed Date: Thu, 11 Aug 2016 07:22:23 -0400 Subject: [PATCH] fix merge issues --- src/index.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/index.ts b/src/index.ts index 804ca43a..6a907398 100644 --- a/src/index.ts +++ b/src/index.ts @@ -93,11 +93,7 @@ export * from './plugins/datepicker'; export * from './plugins/device'; export * from './plugins/devicemotion'; export * from './plugins/deviceorientation'; -<<<<<<< HEAD export * from './plugins/file'; -======= -export * from './plugins/facebook'; ->>>>>>> master export * from './plugins/filetransfer'; export * from './plugins/geolocation'; export * from './plugins/googlemaps'; @@ -141,11 +137,7 @@ export { Dialogs, Diagnostic, EmailComposer, -<<<<<<< HEAD Facebook, -======= - File, ->>>>>>> master Flashlight, Globalization, GooglePlus,