解决之前merge时收藏代码丢失的问题
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/fragment/EssayColumnDetailFragment.java