revert前の作業
master追加
Merge branch 'hogehoge'

Conflicts:
	test.txt
hogehogeの作業内容
masterでの作業2
Merge branch 'hogehoge'
Revert "Merge branch 'hogehoge'"

This reverts commit f1d9aff33b24f8a01d79b5a533e97af9c3b3c60a, reversing
changes made to ad9aafc81ebbbbdc22472a7faa2176614c8ca7b0.
masterの作業