项目文件
...
Merge branch 'master' of https://github.com/GaysOfNewLife/makejournal

Conflicts:
	123/.project