Update hoge.html
conflict
Merge remote-tracking branch 'GitTest/develop' into develop

Conflicts:
	hoge.html
Update hoge.html
create conflict
Merge remote-tracking branch 'GitTest/develop' into develop

Conflicts:
	hoge.html
Update hoge.html
c
Merge branch 'develop' of github.com:takehiro224/GitTest into develop

Conflicts:
	hoge.html
Merge remote-tracking branch 'GitTest/master'

Conflicts:
	hoge.html