github/awesome-cordova-plugins
github/awesome-cordova-plugins
3
0
Fork 1
mirror of https://github.com/danielsogl/awesome-cordova-plugins.git synced 2025-05-07 02:42:56 +08:00
Code Issues Projects Releases Wiki Activity

fix merge issues

Browse Source
This commit is contained in:
Ibby Hadeed 2016-08-11 07:22:23 -04:00
parent 6ed32efe27
commit 9b86ac637f
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/index.ts
View File

@ -93,11 +93,7 @@ export * from './plugins/datepicker';
export * from './plugins/device'; export * from './plugins/device';
export * from './plugins/devicemotion'; export * from './plugins/devicemotion';
export * from './plugins/deviceorientation'; export * from './plugins/deviceorientation';
<<<<<<< HEAD
export * from './plugins/file'; export * from './plugins/file';
=======
export * from './plugins/facebook';
>>>>>>> master
export * from './plugins/filetransfer'; export * from './plugins/filetransfer';
export * from './plugins/geolocation'; export * from './plugins/geolocation';
export * from './plugins/googlemaps'; export * from './plugins/googlemaps';
@ -141,11 +137,7 @@ export {
Dialogs, Dialogs,
Diagnostic, Diagnostic,
EmailComposer, EmailComposer,
<<<<<<< HEAD
Facebook, Facebook,
=======
File,
>>>>>>> master
Flashlight, Flashlight,
Globalization, Globalization,
GooglePlus, GooglePlus,