test message
for conflict
devubha committed
Merge branch 'master' of file:////172.25.54.63/Users/devendrasinhz/git/pilot
devubha committed another tym
Merge branch 'master' of git://github.com/dskrpilot/pilot

Conflicts:
	test.txt