Authored by Rock Zhang

fix bug caused by conflict

@@ -260,5 +260,6 @@ class AbstractAction extends Controller_Abstract @@ -260,5 +260,6 @@ class AbstractAction extends Controller_Abstract
260 } 260 }
261 261
262 $this->_view->assign('footer', $footer); 262 $this->_view->assign('footer', $footer);
  263 + }
263 264
264 } 265 }