是事实上是

ssss
Merge branch 'master' of https://github.com/TeamOfFBAuto/FBCircle0806

Conflicts:
	FBCircle/FBCircle.xcodeproj/project.pbxproj