iOS Team / LiveVideoCloud · Commits

# Conflicts:
#	LiveVideoCloud.xcodeproj/project.pbxproj
#	LiveVideoCloud/PrefixHeader.pch

# Conflicts:
#	LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m

Conflicts:
	LiveVideoCloud.xcodeproj/project.pbxproj
	LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
	LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCTVLiveViewController.h
	LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCTVLiveViewController.m
	LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m

Conflicts:
	LiveVideoCloud.xcodeproj/project.pbxproj