line1 - added
line2 - added.
line3 - added
line3 - added after rebase
Merge branch 'master' of https://github.com/mitko100/TestGit
line4 added
line5
line6
line7
2 line added 11,22
Revert "line2 - added."

This reverts commit 8d94717ac95ca27a7e959ad2b723649c60ce1715.

Conflicts:
	resource.txt
antoher res - addded
Merge branch 'master' of https://github.com/mitko100/TestGit