tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Removed conflict marker from changelog

Browse Source
This commit is contained in:
Minh Nguyễn
2017-01-18 12:15:53 -08:00
parent f6715694f9
commit feb4da4a24
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/android/CHANGELOG.md
View File

@@ -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)