Create README.md
f
项目移动
测试类
a
start spring
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	README.md
	pom.xml
	src/main/webapp/WEB-INF/web.xml
	src/test/resources/shiro-demo.ini