Authored by Rock Zhang

fix bug caused by conflict

... ... @@ -260,5 +260,6 @@ class AbstractAction extends Controller_Abstract
}
$this->_view->assign('footer', $footer);
}
}
... ...