this is new file after revert

this is new file after revert
Merge branch 'master' of https://github.com/vijaypadhariya/testrepo

Conflicts:
	new.php