Unverified Commit fb0e85f4 authored by Riccardo Spagni's avatar Riccardo Spagni
Browse files

fix merged conflicts

parents fe5bc2f9 9b5afbf0
...@@ -14,8 +14,10 @@ ...@@ -14,8 +14,10 @@
url: https://www.coincut.com url: https://www.coincut.com
- name: Cryptopia - name: Cryptopia
url: https://www.cryptopia.co.nz/Exchange?market=XMR_BTC url: https://www.cryptopia.co.nz/Exchange?market=XMR_BTC
+ - name: Livecoin (BTC and USD trading pairs) - name: Livecoin (BTC and USD trading pairs)
+ url: https://www.livecoin.net url: https://www.livecoin.net
- name: LiteBit (Bankwire/GiroPay/iDeal/SOFORT)
url: https://www.litebit.eu/en/buy/monero
- name: Poloniex - name: Poloniex
url: https://poloniex.com/exchange/btc_xmr url: https://poloniex.com/exchange/btc_xmr
- name: ShapeShift (Instant) - name: ShapeShift (Instant)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment