From 3a9a65fb539e771361343bb8bf12695b23538a75 Mon Sep 17 00:00:00 2001
From: Chuck Williams <chuckwilliams37@gmail.com>
Date: Wed, 5 Apr 2017 23:05:50 -0600
Subject: [PATCH] Merge cleanup

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

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