fixed conflict in merchants.yml

This commit is contained in:
Riccardo Spagni 2016-06-06 15:33:09 +02:00
commit 2f95c926b1
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -54,6 +54,8 @@
merchants:
- name: CryptoEscrow Escrow Service
url: http://www.cryptoescrow.eu
- name: Cryptostorm VPN
url: https://cryptostorm.is/
- name: Esperanto lessons from Kaja
url: mailto:kiah.morante@gmail.com
- 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