From 263e713f17e529a14da2a4ec3699d111e4c3fae9 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 5 Jun 2024 14:06:11 +0200
Subject: [PATCH] Resolve conflicts on Rebase/Element-v1.11.12 into Tchap

---
 Config/AppVersion.xcconfig |  5 -----
 Podfile.lock               | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index ac0691f0d..ca0d8e7b3 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,10 +15,5 @@
 //
 
 // Version
-<<<<<<< HEAD
 MARKETING_VERSION = 2.7.7
 CURRENT_PROJECT_VERSION = 1
-=======
-MARKETING_VERSION = 1.11.12
-CURRENT_PROJECT_VERSION = 1.11.12
->>>>>>> v1.11.12
diff --git a/Podfile.lock b/Podfile.lock
index 99fbf2ae6..8566bd194 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -39,20 +39,20 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.8):
-    - MatrixSDK/Core (= 0.27.8)
-  - MatrixSDK/Core (0.27.8):
+  - MatrixSDK (0.27.7):
+    - MatrixSDK/Core (= 0.27.7)
+  - MatrixSDK/Core (0.27.7):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - MatrixSDKCrypto (= 0.4.2)
+    - MatrixSDKCrypto (= 0.3.13)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.8):
+  - MatrixSDK/JingleCallStack (0.27.7):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.4.2)
+  - MatrixSDKCrypto (0.3.13)
   - OLMKit (3.2.12):
     - OLMKit/olmc (= 3.2.12)
     - OLMKit/olmcpp (= 3.2.12)
@@ -102,8 +102,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.27.8)
-  - MatrixSDK/JingleCallStack (= 0.27.8)
+  - MatrixSDK (= 0.27.7)
+  - MatrixSDK/JingleCallStack (= 0.27.7)
   - OLMKit
   - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
@@ -187,8 +187,8 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 4c5a8572a481340ab233451ad36c1322d371fae5
-  MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc
+  MatrixSDK: e07b2309f3c6498c1df987441da7006d099c47a4
+  MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -208,10 +208,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-<<<<<<< HEAD
 PODFILE CHECKSUM: 3db384be27ed06c11b15ee9abc4616afd45428c1
-=======
-PODFILE CHECKSUM: b6073389caf93d20d47c9e511f4b9c3e1ad6dc5d
->>>>>>> v1.11.12
 
 COCOAPODS: 1.14.3