ローカル編集3
Merge branch 'master' of https://github.com/fujiwara-1221/sample-command-fujiwara

Conflicts:
	sample.txt

衝突回避2