自分も
Merge branch 'master' of https://github.com/itoumas/systena_rep

Conflicts:
	test.txt