-
# Conflicts: # CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.h # CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.m
-
# Conflicts: # CNLiveBusinessTools.podspec # CNLiveBusinessTools/Classes/CNLiveNetBusinessTools.m