home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-11 05:45:56 +10:00
Code Issues Packages Projects Releases Wiki Activity

podile.lock conflict

Browse Source
This commit is contained in:
nixzhu
2015-08-21 15:53:02 +08:00
parent 763c4d2f6a
commit 0834cd2116
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Podfile.lock
-5
View File
@@ -63,13 +63,8 @@ EXTERNAL SOURCES:
:path: "../CatchLib-iOS/MZFayeClient/"
SPEC CHECKSUMS:
<<<<<<< HEAD
1PasswordExtension: d2392e44526be30ae7d23f305e96e411ede9b9d1
AFNetworking: 79f7eb1a0fcfa7beb409332b2ca49afe9ce53b05
=======
1PasswordExtension: fcf300204bda5b5c78936dbb937a7d661f1ca796
AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
>>>>>>> f4d305b8155792152529b84d8c46772080a0985d
APAddressBook: 2c949367b190a993d2cce769a3b20bce8bcf000c
Base64: 4924bf3ca6fa559a5161ef717291bd450eb7bd1a
DeviceGuru: 34cf5b30fd99e7e3a4cee4c77c03bc94a4362be4