Merge conflict fixes

Expensify · Mar 29, 2024 · f403cbc · f403cbc
1 parent 8e3d034
commit f403cbc
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 18 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1363,11 +1363,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-<<<<<<< HEAD
-  - RNLiveMarkdown (0.1.33):
-=======
   - RNLiveMarkdown (0.1.35):
->>>>>>> 7de6f2e (Merge pull request #39282 from software-mansion-labs/@Skalakid/fix-app-crashing-after-entering-emoji)
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,11 +62,7 @@
   },
   "dependencies": {
     "@dotlottie/react-player": "^1.6.3",
-<<<<<<< HEAD
-    "@expensify/react-native-live-markdown": "0.1.33",
-=======
     "@expensify/react-native-live-markdown": "0.1.35",
->>>>>>> 7de6f2e (Merge pull request #39282 from software-mansion-labs/@Skalakid/fix-app-crashing-after-entering-emoji)
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",