From 749787381c3fdcfb45852b2234b8099483ff0cf5 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Thu, 6 Dec 2012 20:23:34 -0800
Subject: Code re-org

---
 views/merchants.html | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 views/merchants.html

(limited to 'views/merchants.html')

diff --git a/views/merchants.html b/views/merchants.html
deleted file mode 100644
index 942e6eda..00000000
--- a/views/merchants.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="container-fluid directory">
-  <div class="row-fluid">
-    <div class="span6">
-      <h1>Merchants</h1>
-      <p>
-      Following is a directory of local shops and businesses in Vancouver that accept bitcoins for payment.  Would you like to be included here?  We'd love to have you!
-      </p>
-      <p><a class="btn" href="/merchants/signup">Sign me up!</a></p>
-    </div>
-  </div>
-
-  <div class="row-fluid">
-    <div class="span4">
-      <h2>Pacific Bliss Massage</h2>
-      <img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" />
-      <p style="overflow: hidden">
-      Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot &amp; Cold Stone Therapy. Treatments can be scheduled at Infinity Salon &amp; Spa and in the summer months at Vancouver's most beautiful location - Wreck Beach!
-      </p>
-    </div>
-
-    <div class="span4">
-      <h2>Sweet Tooth Cafe</h2>
-      <img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" />
-      <p>
-      Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai and homemade soup to Italian specialty coffee drinks, all made right in front of you
-      </p>
-    </div>
-
-    <div class="span4">
-      <h2>Divan Kitchen</h2>
-      <img src="http://sphotos-g.ak.fbcdn.net/hphotos-ak-prn1/150071_116421141753535_3214357_n.jpg" />
-      <p>Authentic Turkish kebab and desserts</p>
-    </div>
-  </div>
-</div>
-- 
cgit v1.2.3