From a1cf8048afc6a6b43bd8701c1301797d1c87d971 Mon Sep 17 00:00:00 2001 From: Alexandre Ferris Date: Tue, 14 May 2024 09:22:54 -0300 Subject: [PATCH 1/2] Commit with unresolved merge conflicts --- gradle/libs.versions.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4d240db2009..6fca51e7d77 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,11 @@ sqldelight = "2.0.1" sqlcipher-android = "4.5.6" pbandk = "0.14.2" turbine = "1.1.0" +<<<<<<< HEAD avs = "9.7.13" +======= +avs = "9.7.15" +>>>>>>> fd90a9b77b (chore: update AVS lib to 9.7.15 (#2762)) jna = "5.14.0" core-crypto = "1.0.0-rc.55" core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1" From aea8ddfece0518a1821aa52cca3b3cb93caf7d04 Mon Sep 17 00:00:00 2001 From: alexandreferris Date: Tue, 14 May 2024 09:24:17 -0300 Subject: [PATCH 2/2] chore: resolve merge conflicts --- gradle/libs.versions.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6fca51e7d77..f8d462c7a8a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,11 +36,7 @@ sqldelight = "2.0.1" sqlcipher-android = "4.5.6" pbandk = "0.14.2" turbine = "1.1.0" -<<<<<<< HEAD -avs = "9.7.13" -======= avs = "9.7.15" ->>>>>>> fd90a9b77b (chore: update AVS lib to 9.7.15 (#2762)) jna = "5.14.0" core-crypto = "1.0.0-rc.55" core-crypto-multiplatform = "0.6.0-rc.3-multiplatform-pre1"