From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 14 Jul 2014 20:32:11 +0000 (-0400)
Subject: update for conflic in setup.phtml
X-Git-Tag: v1.0^2~25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=dea607becafac1213f0f058955257e4e06d69f07;p=web%2FBigFore.git

update for conflic in setup.phtml
---

dea607becafac1213f0f058955257e4e06d69f07
diff --cc setup.phtml
index 4174a8b,3e0aefa..65f4ea5
--- a/setup.phtml
+++ b/setup.phtml
@@@ -99,7 -97,7 +99,8 @@@ default : // {{
      die('<p>Your request could not be completed at this time, please try again later!</p>');
      break; // }}}
  } // }}}
 +define('SMARTY_DIR', '/var/www/server/CommonApps/Smarty/3.1/');
+ define('ORDER_FORM_PAGE', 9);
  /**
   * Path to the common GLM application repository
   */