1
2
3
Merge branch 'master' into Branch_feature

Conflicts:
	test.txt
Merge pull request #1 from AlexeyAB/Branch_feature

Branch feature