处理冲突

c38172d7 · David黄金龙 · b9ee7076 · c38172d7
Commit c38172d7 authored Dec 20, 2023 by David黄金龙
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 10 deletions

Podfile galaxy/Podfile +1 -10

No files found.
--- a/galaxy/Podfile
+++ b/galaxy/Podfile
@@ -21,15 +21,6 @@ target 'galaxy' do
  pod 'CryptoSwift','1.8.0'
  #手动布局
  pod 'SnapKit','5.6.0'
-<<<<<<< Updated upstream
+  #底部tabbar布局
-  #上拉、下拉状态展示
-  pod 'Refresher','0.7.0'
-=======
  pod 'ESTabBarController-swift' , '2.8.0'
-  pod 'IQKeyboardManagerSwift','6.5.10'
->>>>>>> Stashed changes
 end