git commit
git commit
test01.txtのコンフリクト解消
Merge branch 'release' of https://github.com/seafield1979/git_test01 into release