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

Conflicts:
	2.txt
	3.txt