Removed the line added when conflict came up
Revert "Removed the line added when conflict came up"

This reverts commit bd21cdfd63e4eed5b757b8041f2049af9922e449.
removed the reverted commented removal agian
Merge pull request #1 from varghesemathai/master

Removed some lines
Update New Text Document.txt
Create testkrishna
adding random lines
Merge branch 'slave'

Conflicts:
	New Text Document.txt
message
Merge pull request #2 from krishnaanil/master

Please review
Merge branch 'master' of https://github.com/Rajesh317/sample