Resolve merge conflicts

signalfx · Jan 13, 2025 · 898137c · 898137c
1 parent 47e2e0b
commit 898137c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/src/main/java/com/splunk/app/App.kt b/app/src/main/java/com/splunk/app/App.kt
@@ -17,6 +17,8 @@
 package com.splunk.app
 
 import android.app.Application
+import com.cisco.android.common.logger.Logger
+import com.cisco.android.common.logger.consumers.AndroidLogConsumer
 import com.splunk.rum.integration.agent.api.AgentConfiguration
 import com.splunk.rum.integration.agent.api.CiscoRUMAgent
 import java.net.URL

diff --git a/...gent/internal/src/main/java/com/splunk/rum/integration/agent/internal/AgentIntegration.kt b/...gent/internal/src/main/java/com/splunk/rum/integration/agent/internal/AgentIntegration.kt
@@ -18,7 +18,6 @@ package com.splunk.rum.integration.agent.internal
 
 import android.content.Context
 import com.cisco.android.common.logger.Logger
-import com.cisco.android.common.logger.consumers.AndroidLogConsumer
 import com.splunk.rum.integration.agent.internal.config.ModuleConfigurationManager
 import com.splunk.rum.integration.agent.internal.config.RemoteModuleConfiguration
 import com.splunk.rum.integration.agent.internal.session.SessionManager