# Conflicts:
#	galaxy/fastlane/Fastfile
#	galaxy/galaxy/Applegate(JPush).swift
#	galaxy/galaxy/Classes/Modules/Message(消息)/M/YHMsgListModel.swift
#	galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift

# Conflicts:
#	galaxy/galaxy/Applegate(JPush).swift

High

See merge request !11

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj

# Conflicts:
#	galaxy/fastlane/Fastfile