Bad merge

git-svn-id: https://plugins.svn.wordpress.org/woocommerce-fat-zebra-gateway/trunk@1024857 b8457f37-d9ea-0310-8a92-e5e31aec5664