fix: conflict

software-mansion-labs · Dec 10, 2024 · 257505b · 257505b
1 parent 24ebdc7
commit 257505b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/apps/fabric-example/ios/Podfile.lock b/apps/fabric-example/ios/Podfile.lock
@@ -2152,11 +2152,7 @@ SPEC CHECKSUMS:
   React-utils: d9624101245ebaab39c9f1bd786132da0b4f27ff
   ReactCodegen: dbfef1fef26f42c900bb1884fa149d49d501d64d
   ReactCommon: 429ca28cd813c31359c73ffac6dc24f93347d522
-<<<<<<< HEAD
-  RNAudioAPI: 988ab6ec4fc80771859b0dd0dd86ea1571ccde09
-=======
   RNAudioAPI: 837e19b456700c09bfd3d3c0068b82d2a11c68d0
->>>>>>> main
   RNGestureHandler: 0e5ae8d72ef4afb855e98dcdbe60f27d938abe13
   RNReanimated: 006a5d3961bf09c1e96d62ed436e02b2e43b89bb
   RNScreens: e389d6a6a66a4f0d3662924ecae803073ccce8ec