From feb4da4a24e5d8d555884c424b061521b0aff412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Wed, 18 Jan 2017 12:15:53 -0800 Subject: [PATCH] [android] Removed conflict marker from changelog --- platform/android/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 473ac310e..c702e1e75 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)