删除多余的配置
Merge branch 'master' of github.com:diguage/ThinkingInJava

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml