chore: fix conflict in Podfile.lock

facebook · Mar 1, 2021 · 48a97d7 · 48a97d7
1 parent e7e4b00
commit 48a97d7
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
@@ -795,13 +795,8 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 91e874a8823933a268c38765a88cbd5dba1fa024
-<<<<<<< HEAD
-  FBReactNativeSpec: 58a907f57c40ca74a954abe86862baa5eb423c63
-  Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
-=======
   FBReactNativeSpec: 6793f00102a091fb931674853172fb22e5a2c4cf
   Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
->>>>>>> 3399896ae75... Update flipper in RNTester and template (#31010)
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
   Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6