From 0834cd2116ef3f4a44e4dfe43164efbf65b4e49a Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 21 Aug 2015 15:53:02 +0800
Subject: [PATCH] podile.lock conflict

---
 Podfile.lock | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index 40209394..2f6313ab 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -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