Commit with unresolved merge conflicts outside of submodules

wireapp · Dec 16, 2024 · b54defb · b54defb
1 parent 842aa6a
commit b54defb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...bled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt b/...bled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt
@@ -86,7 +86,11 @@ class AnonymousAnalyticsRecorderImpl : AnonymousAnalyticsRecorder {
 
     override fun halt() = wrapCountlyRequest {
         isConfigured = false
+<<<<<<< HEAD
         Countly.sharedInstance().consent().removeConsentAll()
+=======
+        Countly.sharedInstance()?.consent()?.removeConsentAll()
+>>>>>>> 5e643acf0 (fix: countly sdk integration replace halt and bump to latest (WPB-15007) (#3748))
     }
 
     override suspend fun setTrackingIdentifierWithMerge(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@ coil = "2.7.0"
 commonmark = "0.24.0"
 
 # Countly
-countly = "24.4.0"
+countly = "24.7.7"
 
 # RSS
 rss-parser = "6.0.7"