diff options
Diffstat (limited to 'ios/Podfile.lock')
| -rw-r--r-- | ios/Podfile.lock | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 19df8c81..a889399c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -134,6 +134,26 @@ PODS: - GoogleUtilities/Environment (~> 7.2) - nanopb (~> 2.30907.0) - PromisesObjC (~> 1.2) +<<<<<<< HEAD + - GoogleUtilities/AppDelegateSwizzler (7.4.3): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network + - GoogleUtilities/Environment (7.4.3): + - PromisesObjC (~> 1.2) + - GoogleUtilities/Logger (7.4.3): + - GoogleUtilities/Environment + - GoogleUtilities/MethodSwizzler (7.4.3): + - GoogleUtilities/Logger + - GoogleUtilities/Network (7.4.3): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (7.4.3)" + - GoogleUtilities/Reachability (7.4.3): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (7.4.3): +======= - GoogleUtilities/AppDelegateSwizzler (7.4.0): - GoogleUtilities/Environment - GoogleUtilities/Logger @@ -152,6 +172,7 @@ PODS: - GoogleUtilities/Reachability (7.4.0): - GoogleUtilities/Logger - GoogleUtilities/UserDefaults (7.4.0): +>>>>>>> master - GoogleUtilities/Logger - libevent (2.1.12) - nanopb (2.30907.0): @@ -753,7 +774,11 @@ SPEC CHECKSUMS: glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 GoogleAppMeasurement: c542a2feaac9ab98fd074e8f1a02c3585bbfbd47 GoogleDataTransport: 8b0e733ea77c9218778e5a9e34ba9508b8328939 +<<<<<<< HEAD + GoogleUtilities: 45dbb24a7f351d69d0a601482b39ad6c32e30dab +======= GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc +>>>>>>> master libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 nanopb: 59221d7f958fb711001e6a449489542d92ae113e OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b |