From 025a151b7a1d2b8106f63c114c5290001777e5bd Mon Sep 17 00:00:00 2001 From: Frank Rotermund Date: Tue, 16 May 2023 16:13:34 +0200 Subject: [PATCH] MESSENGER-4697 remove rej file --- Podfile.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Podfile.rej diff --git a/Podfile.rej b/Podfile.rej deleted file mode 100644 index 7e55d395b..000000000 --- a/Podfile.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/Podfile b/Podfile (rejected hunks) -@@ -44,7 +44,7 @@ $matrixSDKVersionSpec = $matrixSDKVersion - end - - # $matrixSDKVersionSpec = { :git => 'https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk', :branch => 'master' } --$matrixSDKVersionSpec = { :git => 'https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk.git', :tag => 'v0.23.13_bwi_2' } -+$matrixSDKVersionSpec = { :git => 'https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk.git', :tag => 'v0.23.13_bwi_3' } - - # Method to import the MatrixSDK - def import_MatrixSDK