new line
new version
Merge branch '6-New' of https://github.com/DanielNovak/TestRepository into 6-New

Conflicts:
	test2.txt