test1.txt CHANGE
Merge branch 'master' of https://github.com/abc19abc91/Qt

Conflicts:
	test1.txt
rm