1 edit (joined)
2
edit 2
1 new edit
2 new edit
3
3333
4text
3 digits
add 4
include 4
modified 4
end 3
include 3
Merge branch 'creating4'

Conflicts:
	1.txt
	2.txt
Merge https://github.com/silart-teplomonitor/testrepo

Conflicts:
	1.txt
	2.txt