Unverified Commit 2f95c926 authored by Riccardo Spagni's avatar Riccardo Spagni
Browse files

fixed conflict in merchants.yml

parents 4b321f07 2aaf768e
......@@ -54,6 +54,8 @@
- name: CryptoEscrow Escrow Service
url: http://www.cryptoescrow.eu
- name: Cryptostorm VPN
url: https://cryptostorm.is/
- name: Esperanto lessons from Kaja
url: mailto:[email protected]
- name: Web Developer - Stefanos
......@@ -62,6 +64,8 @@
url: https://mymonero.com
- name: Pradeep Atluri, Psychiatrist, New York
url: http://dr.mindsci.com/
- name: Web Developer - Stefanos
url: http://www.stefanosioannou.com/web-development-monero-accepted
- name: XMR.link OpenAlias Registry
url: https://www.xmr.link/
- name: XMR.to Monero to Bitcoin Payment Service
Supports Markdown
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