joshua/dash-website
1
0
Fork 0
mirror of https://github.com/seigler/dash-website synced 2025-07-27 07:16:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge cleanup

Browse source
This commit is contained in:
Chuck Williams 2017-04-05 23:05:50 -06:00
parent 734ca4b059
commit 3a9a65fb53
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
_data/merchants-stores.yml
View file

@ -129,10 +129,6 @@
url: https://mywabo.com url: https://mywabo.com
image: Wabo.png image: Wabo.png
<<<<<<< HEAD
=======
>>>>>>> ccee525... new merchant
- name: Buy with Dash - name: Buy with Dash
title: Buy with Dash title: Buy with Dash
url: http://www.buywithdash.org url: http://www.buywithdash.org