diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 17:59:17 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 17:59:17 -0400 |
| commit | c5625f988a37b6876c4ef5fc8d9de295ee28ed44 (patch) | |
| tree | 0c485cce575cee047f61fe274aad44763694dc94 /platform/android/MapboxGLAndroidSDK | |
| parent | e08b6fe87f5824ab05a4cc67d9a76af5bb5ddd3b (diff) | |
| download | qtlocation-mapboxgl-c5625f988a37b6876c4ef5fc8d9de295ee28ed44.tar.gz | |
[ios, android] Resolve merge conflicts.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/gradle.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index bdfc444454..84aeabef1a 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -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 |