local sub
local master
Merge branch 'master' of github.com:takehiro224/GitTest

Conflicts:
	MyTextFile.txt