|
@@ -65,19 +65,13 @@ SPEC CHECKSUMS:
|
|
|
JQImagePicker: d2db45f8e91b8a29e62ff5ab3e4eb65f0f99cf23
|
|
|
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
|
|
|
MJExtension: 21c5f6f8c4d5d8844b7ae8fbae08fed0b501f961
|
|
|
-<<<<<<< HEAD:Pods/Manifest.lock
|
|
|
- RayProxy: e7d1ab81fa3aa0345f80204364625716d82c5cd3
|
|
|
-=======
|
|
|
RayProxy: 0091a19c131d7906d039f0802cce4b113405e568
|
|
|
->>>>>>> 9a9fa856122ac094b2c597955a87861fe6b78056:创维盒子/Pods/Manifest.lock
|
|
|
SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
|
|
|
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
|
|
|
TZImagePickerController: 679ae9fa11e189a9a81291ae96f0a4463be8edc1
|
|
|
|
|
|
PODFILE CHECKSUM: 466042d3dd9ffb010d420ec90082b9fdbdb4347d
|
|
|
|
|
|
-<<<<<<< HEAD:Pods/Manifest.lock
|
|
|
-COCOAPODS: 1.13.0
|
|
|
-=======
|
|
|
+
|
|
|
COCOAPODS: 1.11.3
|
|
|
->>>>>>> 9a9fa856122ac094b2c597955a87861fe6b78056:创维盒子/Pods/Manifest.lock
|
|
|
+
|