From 58b81327b9ae150ef3fa7a733d7cad31dd941c26 Mon Sep 17 00:00:00 2001 From: Rob Judd Date: Sat, 29 Oct 2016 03:43:55 +1000 Subject: [PATCH] Take out merge crap --- gui/src/main/resources/i18n/displayStrings.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gui/src/main/resources/i18n/displayStrings.properties b/gui/src/main/resources/i18n/displayStrings.properties index 84c15619e4..282dd4d56b 100644 --- a/gui/src/main/resources/i18n/displayStrings.properties +++ b/gui/src/main/resources/i18n/displayStrings.properties @@ -45,11 +45,7 @@ payment.email=Email: payment.country=Country: payment.owner.email=Account holder email: payment.extras=Extra requirements: -<<<<<<< HEAD -payment.us.info=Bank transfer with WIRE or ACH is not supported for the US because WIRE is too expensive and ACH has a high chargeback risk.\\n\\nPlease use payment methods \\"ClearXchange\\", \\"US Postal Money Order\\" or \\"Cash/ATM Deposit\\" instead. -======= payment.us.info=Bank transfer with WIRE or ACH is not supported for the US because WIRE is too expensive and ACH has a high chargeback risk.\n\nPlease use payment methods \"ClearXchange\", \"US Postal Money Order\" or \"Cash/ATM Deposit\" instead. ->>>>>>> 066120623013ecd4dc807df44c313469b6e1ccba payment.email.mobile=Email or mobile no.: payment.altcoin.address=Altcoin address: payment.address=address: