nextlab
1
2
сделал что-то непонятное
Merge branch 'master' of https://github.com/yaroslav-gorbenko/labs into Huita

Conflicts:
	pom.xml
	pom.xml.orig
	src/test/resources/hibernate.cfg.xml
	src/test/resources/hibernate.cfg.xml.orig
Merge branch 'master' of https://github.com/yaroslav-gorbenko/labs into Huita