Skip to content

GMPhobos
GMPhobos
Commit f92d0556 authored by 翟国钧's avatar 翟国钧
Browse files
Options

update

parent c908f25c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
Example/Pods/Manifest.lock
View file @ f92d0556
...@@ -28,11 +28,7 @@ PODS: ...@@ -28,11 +28,7 @@ PODS:
- GMLibrary/Network (0.0.1): - GMLibrary/Network (0.0.1):
- AFNetworking (~> 2.6.1) - AFNetworking (~> 2.6.1)
- GMLibrary/Cache (~> 0.0.1) - GMLibrary/Cache (~> 0.0.1)
<<<<<<< HEAD
- GMPhobos (0.1.5): - GMPhobos (0.1.5):
=======
- GMPhobos (0.1.4):
>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
- GMLibrary (~> 0.0.1) - GMLibrary (~> 0.0.1)
- TMCache (2.1.0) - TMCache (2.1.0)
...@@ -46,11 +42,7 @@ EXTERNAL SOURCES: ...@@ -46,11 +42,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60 AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
GMLibrary: c31039ad32bc93f866d6c3052c20acb8cf9c1568 GMLibrary: c31039ad32bc93f866d6c3052c20acb8cf9c1568
<<<<<<< HEAD
GMPhobos: 0eb71964e6d28ca2fc20a25d4b8a6f07efb671c6 GMPhobos: 0eb71964e6d28ca2fc20a25d4b8a6f07efb671c6
=======
GMPhobos: 3f04110df4b8dec487ed63622ffd7c4ac8b4342e
>>>>>>> 8d05d5bee85c819788f7cd52bcfc3da2a88d0212
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
COCOAPODS: 0.39.0 COCOAPODS: 0.39.0
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment