Skip to content

G
galaxy-iOS
Commit 36ff0a04 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

解决冲突

parent c492c075
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
galaxy/Podfile
View file @ 36ff0a04
...@@ -27,7 +27,7 @@ target 'galaxy' do ...@@ -27,7 +27,7 @@ target 'galaxy' do
pod 'SwifterSwift','6.0.0' pod 'SwifterSwift','6.0.0'
#下拉刷新、上拉更多 #下拉刷新、上拉更多
pod 'ESPullToRefresh',"2.9.3" pod 'ESPullToRefresh',"2.9.3"
<<<<<<< Updated upstream
#Toast #Toast
pod 'Toast-Swift', '5.0.1' pod 'Toast-Swift', '5.0.1'
#富文本 UILabel #富文本 UILabel
...@@ -52,13 +52,9 @@ target 'galaxy' do ...@@ -52,13 +52,9 @@ target 'galaxy' do
#字典、模型互转 #字典、模型互转
pod 'SmartCodable','2.2.2' pod 'SmartCodable','2.2.2'
=======
#设备框架 #设备框架
pod 'DeviceKit', '~> 5.1' pod 'DeviceKit', '~> 5.1'
>>>>>>> Stashed changes
# #数据模型转换 # #数据模型转换
pod 'HandyJSON','5.0.2' pod 'HandyJSON','5.0.2'
......
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