D
E
F
Merge branch 'master' of https://github.com/kosakasakas/test
Revert "Merge branch 'master' of https://github.com/kosakasakas/test"

This reverts commit 6997cc22299929a3cb501bcfc1a679d57f740f69, reversing
changes made to 9f0416af53e676d21da8a7ff443880dc5085c322.
テスト
テスト2
Merge branch 'hoge'

Conflicts:
	a.txt
a.txtは残しました