From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 Mar 2015 14:08:59 +0000 (-0400)
Subject: Merge branch 'feature/MembersOnly' into develop
X-Git-Tag: v1.2.0^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=97d08fed1de5997c5d4649f6dfd9fc809ea19ee2;p=web%2FGaylordGolfMecca.git

Merge branch 'feature/MembersOnly' into develop
---

97d08fed1de5997c5d4649f6dfd9fc809ea19ee2
diff --cc templates/template.html
index 93d8cd4,b23bcec..778aa72
--- a/templates/template.html
+++ b/templates/template.html
@@@ -177,8 -199,9 +185,9 @@@
                          <div id="toolbox" class="small-12 columns">
                              {toolboxContent:h}
                          </div>
+                         {end:}
                      </div>
 -                    <div id="offer" class="row">
 +                    <div id="offer" class="row" flexy:if="!isHomePage">
                          <div class="small-12 medium-4 columns text-center">
                              <a href="{secureBaseURL:h}2-for--1-passport-16/"><img src="{mediaBaseURL:h}assets/interior_offer.png"></a>
                          </div>