mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Take out merge crap

Browse source
This commit is contained in:
Rob Judd 2016-10-29 03:43:55 +10:00
parent c97b85e2af
commit 58b81327b9
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/src/main/resources/i18n/displayStrings.properties
View file

@ -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: