Signed-off-by: liugang <799834443@qq.com>
liugang
Merge branch 'master' of github.com:liugang19890719/git_version

Conflicts:
	test.txt
liugang
good