感想
2行削除
Merge branch 'master' of github.com:hao03/git_dojo into agn3

Conflicts:
	txt.txt
Merge branch 'master' of github.com:hao03/git_dojo into agn3
Merge branch 'master' of github.com:hao03/git_dojo into agn3

Conflicts:
	txt.txt