modified:   test1.txt
Merge branch 'master' of https://github.com/iwho/frame1

Conflicts:
	test1.txt

	modified:   test1.txt