add 123456 text

Signed-off-by: jim_qiao <qiaohhgz@163.com>
Merge branch 'master' of https://github.com/qiaohhgz/gittest

Conflicts:
	test.txt