From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 5 Apr 2017 19:21:52 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.14' into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5ad436264986fae05efbb1b57a19a9e31ce789fc;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.14' into develop

Conflicts:
	templates/template.html
---

5ad436264986fae05efbb1b57a19a9e31ce789fc
diff --cc templates/template.html
index 5ca6984,0e09f54..f6df28b
--- a/templates/template.html
+++ b/templates/template.html
@@@ -92,8 -91,7 +92,12 @@@
                          </li>
                          <li>
                              <i>Summer&#42;&#42;&#42;</i>
++<<<<<<< HEAD
 +                            <b>$471 per golfer</b>
 +
++=======
+                             <b>$391 per golfer</b>
++>>>>>>> hotfix/1.1.14
                          </li>
                          <li>
                              <i>Early Fall</i>
@@@ -101,8 -99,7 +105,12 @@@
                          </li>
                          <li>
                              <i>Late Fall</i>
++<<<<<<< HEAD
 +
 +                            <b>$317 per golfer</b>
++=======
+                             <b>$322 per golfer</b>
++>>>>>>> hotfix/1.1.14
                          </li>
                      </ul>
                      <p><b>All taxes and fees included</b></p>
@@@ -113,8 -110,7 +121,12 @@@
                      <ul>
                          <li>
                              <i>May Special&#42;&#42;</i>
++<<<<<<< HEAD
 +
 +                            <b>$335 per golfer</b>
++=======
+                             <b>$399 per golfer</b>
++>>>>>>> hotfix/1.1.14
                          </li>
                          <li>
                              <i>Summer&#42;&#42;&#42;</i>