update for conflic in setup.phtml

diff --cc setup.phtml
index 4174a8b,3e0aefa..65f4ea5
--- 1/setup.phtml
--- 2/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
   */