Rectified Conflict

git-svn-id: https://plugins.svn.wordpress.org/woocommerce-payu-paisa/trunk@847465 b8457f37-d9ea-0310-8a92-e5e31aec5664