Fix merge conflicts

aminekarimii · Jul 16, 2023 · 622661a · 622661a
1 parent 926945e
commit 622661a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,6 +54,7 @@ dependencies {
     implementation 'io.github.aminekarimii:analytiks-addon-segment:1.0.0'
 
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation project(path: ':addon:analytiks-amplitude')
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

diff --git a/app/src/main/java/com/logitanalyticsapp/MainActivity.kt b/app/src/main/java/com/logitanalyticsapp/MainActivity.kt
@@ -5,7 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.analytiks.Analytiks
 import com.analytiks.addon.amplitude.AmplitudeClient
 import com.analytiks.addon.amplitude.ServerGeoZone
-import com.analytiks.addon.googleanalytics.GoogleAnalyticsClient
+import com.analytiks.addon.mixpanel.GoogleAnalyticsClient
 import com.analytiks.addon.mixpanel.MixpanelAnalyticsClient
 import com.analytiks.addon.timber.TimberLocalClient
 import com.analytiks.core.CoreAddon