Update Podfile.lock

Expensify · Mar 29, 2024 · d0ab0a2 · d0ab0a2
1 parent f403cbc
commit d0ab0a2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1904,11 +1904,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 25b969a1ffc806b9f9ad2e170d4a3b049c6af85e
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-<<<<<<< HEAD
-  RNLiveMarkdown: aaf75630fb2129db43fb5a873d33125e7173f3a0
-=======
   RNLiveMarkdown: aaf5afb231515d8ddfdef5f2928581e8ff606ad4
->>>>>>> 7de6f2e (Merge pull request #39282 from software-mansion-labs/@Skalakid/fix-app-crashing-after-entering-emoji)
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: fcf7f1cbdc8bd7569c267d07284e8a5c7bee06ed
   RNPermissions: 9b086c8f05b2e2faa587fdc31f4c5ab4509728aa