test
test2
pom3
tt2
right pom
test 222
test4
Merge branch 'master' of https://github.com/tcwdsg/xladminlib.git

Conflicts:
	pom.xml
	test.txt