From 292a9f08e991e94486b5410f76fbb3c0c5a163f7 Mon Sep 17 00:00:00 2001
From: John-Luke <lucas_ennabledmu2@otmail.com>
Date: Wed, 18 Jan 2017 19:06:27 -0200
Subject: [PATCH] solve conflict

---
 src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index 9bd1800aa..6d5e2b6db 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -162,7 +162,7 @@ export * from './plugins/geolocation';
 export * from './plugins/globalization';
 export * from './plugins/google-plus';
 export * from './plugins/googleanalytics';
-export * from './plugins/googlemaps';
+export * from './plugins/googlemap';
 export * from './plugins/headercolor';
 export * from './plugins/hotspot';
 export * from './plugins/http';