file deleted
test 44 for conflict
test 44 conflict
test for conflict by vishal
added file from dev
Merge branch 'master' of https://github.com/amitpatel111/test2
Merge branch 'dev-girish'

Conflicts:
	test44.txt
solve conflict in master by vishal
Merge branch 'master' of https://github.com/amitpatel111/test2