fix merged conflicts

fb0e85f4 · Riccardo Spagni · fe5bc2f9 · 9b5afbf0 · fb0e85f4
Unverified Commit fb0e85f4 authored Sep 19, 2016 by Riccardo Spagni
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

_data/merchants.yml _data/merchants.yml +4 -2

No files found.
--- a/_data/merchants.yml
+++ b/_data/merchants.yml
@@ -14,8 +14,10 @@
      url: https://www.coincut.com
    - name: Cryptopia
      url: https://www.cryptopia.co.nz/Exchange?market=XMR_BTC
-+   - name: Livecoin (BTC and USD trading pairs)
-+     url: https://www.livecoin.net
+    - name: Livecoin (BTC and USD trading pairs)
+      url: https://www.livecoin.net
+    - name: LiteBit (Bankwire/GiroPay/iDeal/SOFORT)
+      url: https://www.litebit.eu/en/buy/monero
    - name: Poloniex
      url: https://poloniex.com/exchange/btc_xmr
    - name: ShapeShift (Instant)