test-project
.git
.git
Merge branch 'master' of github.com:yauheni-rubashka/testrepo

Conflicts:
	project/pom.xml