someone
my line 1 added
Merge branch 'master' of git@github.com:TEGitTraining01/TEGitTraining01.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/rijak/TEGitTraining01.git

Conflicts:
	README.md
pridani
Merge branch 'master' of git@github.com:TEGitTraining01/TEGitTraining01.git

Conflicts:
	README.md
Merge branch 'master' of git@github.com:rijak/TEGitTraining01.git

Conflicts:
	README.md