пример
test
Merge branch 'master' of ssh://github.com/SanCHEESE/mini-java

Conflicts:
	code/utils.h