about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Frazee <pfrazee@gmail.com>2023-03-19 19:46:49 -0500
committerPaul Frazee <pfrazee@gmail.com>2023-03-19 19:46:49 -0500
commitd9ed13ea909db93a89ce31bbb506da64effc46f7 (patch)
treeea71867f77ddfa0ed0495c2a798dd9f2b4310cf9
parent1dcd7e57359e487895d5f2c07fe25a991c5a1905 (diff)
downloadvoidsky-d9ed13ea909db93a89ce31bbb506da64effc46f7.tar.zst
Fix Podfile.lock
-rw-r--r--ios/Podfile.lock6
1 files changed, 0 insertions, 6 deletions
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index ac4fd4dd9..f0de3762e 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -385,11 +385,8 @@ PODS:
   - react-native-blur (4.3.0):
     - React-Core
   - react-native-cameraroll (5.3.1):
-<<<<<<< HEAD
-=======
     - React-Core
   - react-native-get-random-values (1.8.0):
->>>>>>> onboarding-and-discovery
     - React-Core
   - react-native-image-resizer (3.0.5):
     - React-Core
@@ -877,10 +874,7 @@ SPEC CHECKSUMS:
   React-logger: 957e5dc96d9dbffc6e0f15e0ee4d2b42829ff207
   react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
   react-native-cameraroll: f3050460fe1708378698c16686bfaa5f34099be2
-<<<<<<< HEAD
-=======
   react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
->>>>>>> onboarding-and-discovery
   react-native-image-resizer: 00ceb0e05586c7aadf061eea676957a6c2ec60fa
   react-native-pager-view: 54bed894cecebe28cede54c01038d9d1e122de43
   react-native-paste-input: 3392800944a47c00dddbff23c31c281482209679