From 734ca4b059470164337b488f0c87a427d4595897 Mon Sep 17 00:00:00 2001
From: Chuck Williams <chuckwilliams37@gmail.com>
Date: Wed, 5 Apr 2017 22:53:55 -0600
Subject: [PATCH] new merchant

---
 _data/merchants-stores.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_data/merchants-stores.yml b/_data/merchants-stores.yml
index bb28241..ace1e71 100644
--- a/_data/merchants-stores.yml
+++ b/_data/merchants-stores.yml
@@ -129,6 +129,10 @@
   url: https://mywabo.com
   image: Wabo.png
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> ccee525... new merchant
 - name: Buy with Dash
   title: Buy with Dash
   url: http://www.buywithdash.org