lint

status-im · Dec 19, 2023 · 0f92c78 · 0f92c78
1 parent d015a3e
commit 0f92c78
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -800,15 +800,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 71803c074f6325f10b5ec891c443b6bbabef0ca7
   FBReactNativeSpec: 448e08a759d29a96e15725ae532445bf4343567c
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-<<<<<<< HEAD
-<<<<<<< HEAD
   glog: cf171f517b828fdde711287b723e348da1ea0fc3
-=======
-  glog: d93527a855523adb8c113837db4be68fb00e230d
->>>>>>> 90837c382 (wallet: receive screen)
-=======
-  glog: c5b451128f1a485ffb9be9df3f544b001bd1fde0
->>>>>>> 59a25e7e6 (lint)
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef