modified:   test.txt
Merge branch 'master' of https://github.com/hakchin/git-s-config

Conflicts:
	test.txt