5
5
Merge branch 'master' of github.com:KevinSky/practice
f
Conflicts:
	mybatis/pom.xml
	mybatis/src/main/java/kevin/practice/mybatis/dao/factory/MapperFactory.java
	mybatis/src/main/java/kevin/practice/mybatis/service/NewsService.java
	mybatis/src/test/java/kevin/practice/mybatis/BaseTester.java
	mybatis/src/test/java/kevin/practice/mybatis/NewsTest.java
	practice/pom.xml