solve conflict

This commit is contained in:
John-Luke 2017-01-18 19:06:27 -02:00 committed by GitHub
parent b2cd106aae
commit 292a9f08e9

View File

@ -162,7 +162,7 @@ export * from './plugins/geolocation';
export * from './plugins/globalization'; export * from './plugins/globalization';
export * from './plugins/google-plus'; export * from './plugins/google-plus';
export * from './plugins/googleanalytics'; export * from './plugins/googleanalytics';
export * from './plugins/googlemaps'; export * from './plugins/googlemap';
export * from './plugins/headercolor'; export * from './plugins/headercolor';
export * from './plugins/hotspot'; export * from './plugins/hotspot';
export * from './plugins/http'; export * from './plugins/http';