[ios, android] Resolve merge conflicts.

This commit is contained in:
Fabian Guerra
2018-04-23 17:59:17 -04:00
parent e08b6fe87f
commit c5625f988a
3 changed files with 3 additions and 15 deletions

View File

@@ -1,5 +1,5 @@
GROUP=com.mapbox.mapboxsdk
VERSION_NAME=6.1.0-SNAPSHOT
VERSION_NAME=7.0.0-SNAPSHOT
POM_DESCRIPTION=Mapbox GL Android SDK
POM_URL=https://github.com/mapbox/mapbox-gl-native