diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2017-01-18 12:15:53 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2017-01-18 15:48:42 -0800 |
| commit | feb4da4a24e5d8d555884c424b061521b0aff412 (patch) | |
| tree | fff66a52e466aea8ec1b079df64598fcde94757a /platform/android/CHANGELOG.md | |
| parent | f6715694f918a884eda77151aa4fec05521b9536 (diff) | |
| download | qtlocation-mapboxgl-feb4da4a24e5d8d555884c424b061521b0aff412.tar.gz | |
[android] Removed conflict marker from changelog
Diffstat (limited to 'platform/android/CHANGELOG.md')
| -rw-r--r-- | platform/android/CHANGELOG.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 473ac310ef..c702e1e759 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -4,7 +4,6 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to ## 5.0.0 - TBA -<<<<<<< HEAD * Consistent double tap zoom acceleration [#7514](https://github.com/mapbox/mapbox-gl-native/issues/7514) * Cleanup inconsistencies float vs double [#4445](https://github.com/mapbox/mapbox-gl-native/issues/4445) * Add `mapbox_` prefix to attributes [#6482](https://github.com/mapbox/mapbox-gl-native/issues/6482) |