From 7a341659b15d33416e78dc89bbaf71e03b17444d Mon Sep 17 00:00:00 2001
From: Oussama Hassine <oussama.has100@gmail.com>
Date: Mon, 9 Sep 2024 15:00:12 +0200
Subject: [PATCH] Commit with unresolved merge conflicts

---
 gradle/libs.versions.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2cf097d9cd3..eb5bbdff69a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,8 +35,13 @@ moduleGraph = "0.7.0"
 sqldelight = "2.0.1"
 sqlcipher-android = "4.5.6"
 pbandk = "0.14.2"
+<<<<<<< HEAD
 turbine = "1.1.0"
 avs = "9.8.15"
+=======
+turbine = "1.0.0"
+avs = "9.6.18"
+>>>>>>> 6b3f390332 (chore: Bump AVS to 9.6.18 (#2997))
 jna = "5.14.0"
 core-crypto = "1.0.2"
 core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1"