同じ箇所に同じ編集サーバとローカルで
Merge branch 'issue1' of https://github.com/fujiwara-1221/sample-command-fujiwara into issue1

Conflicts:
	sample.txt

commit