From a14f6c5d615b062c1b825ae77ab22773d2a1a287 Mon Sep 17 00:00:00 2001 From: Jun Dai Date: Tue, 21 Apr 2020 14:25:29 -0700 Subject: [PATCH] fix current master conflict --- .../navigation/examples/core/BasicNavSdkOnlyActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavSdkOnlyActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavSdkOnlyActivity.kt index 4ce1d36057f..b09893eef62 100644 --- a/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavSdkOnlyActivity.kt +++ b/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavSdkOnlyActivity.kt @@ -39,8 +39,8 @@ import com.mapbox.mapboxsdk.style.layers.SymbolLayer import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions import com.mapbox.mapboxsdk.style.sources.GeoJsonSource import com.mapbox.mapboxsdk.utils.BitmapUtils -import com.mapbox.navigation.base.extensions.applyDefaultParams -import com.mapbox.navigation.base.extensions.coordinates +import com.mapbox.navigation.base.internal.extensions.applyDefaultParams +import com.mapbox.navigation.base.internal.extensions.coordinates import com.mapbox.navigation.core.MapboxNavigation import com.mapbox.navigation.core.directions.session.RoutesRequestCallback import com.mapbox.navigation.examples.R