# Conflicts:
#	galaxy/fastlane/Fastfile
#	galaxy/galaxy.xcodeproj/project.pbxproj
#	galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeKingKongBlockView.swift