File1.txt modified 2nd time
We should get a merge conflict now Sam :-)
Merge branch 'master' of //DEWDFTV00227U.dhcp.pgdev.sap.corp/remote

Conflicts:
	file1.txt

Signed-off-by: fskhiri <faycal.skhiri@sap.com>