60
65
70
Merge branch 'master' of github.com:AlexeyAB/TestRep into Branch_feature
80

75
200
210
90

85
Merge branch 'Branch_feature' of github.com:AlexeyAB/TestRep into Branch_feature

Conflicts:
	test.txt
a
b
95
100
105
110
115
Auto Generated by Git...

Conflicts:
	test.txt