Commit 78dc198e163f80d09ad93f85018c0b89fb3f629c
Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # Podfile
Showing
2 changed files
with
2 additions
and
2 deletions
Podfile
| @@ -8,7 +8,7 @@ target 'metaCode' do | @@ -8,7 +8,7 @@ target 'metaCode' do | ||
| 8 | pod 'Alamofire' | 8 | pod 'Alamofire' |
| 9 | pod 'Moya' | 9 | pod 'Moya' |
| 10 | pod 'SwiftyJSON' | 10 | pod 'SwiftyJSON' |
| 11 | - | 11 | + pod 'YYCategories' |
| 12 | # Pods for metaCode | 12 | # Pods for metaCode |
| 13 | 13 | ||
| 14 | target 'metaCodeTests' do | 14 | target 'metaCodeTests' do |
metaCode/Classes/Other/AppDelegate.swift
| @@ -10,7 +10,7 @@ import UIKit | @@ -10,7 +10,7 @@ import UIKit | ||
| 10 | @main | 10 | @main |
| 11 | class AppDelegate: UIResponder, UIApplicationDelegate { | 11 | class AppDelegate: UIResponder, UIApplicationDelegate { |
| 12 | var window: UIWindow? | 12 | var window: UIWindow? |
| 13 | - | 13 | + |
| 14 | 14 | ||
| 15 | func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { | 15 | func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { |
| 16 | 16 |