修改test的1
修改test的1
Merge branch 'test' of https://github.com/prob5818/tr into test

Conflicts:
	1.txt
3
2
Merge branch 'bra' of https://github.com/prob5818/tr into bra

Conflicts:
	2.txt