Fix conflict.

2013-12-11 08:17:46 -06:00 · 2013-12-11 08:17:46 -06:00 · 3053d486e6
parent 0293eaced7 c1ab700b65
commit 3053d486e6
1 changed files with 1 additions and 1 deletions
--- a/app/start/global.php
+++ b/app/start/global.php
@ -78,4 +78,4 @@
 |
 */

-require app_path().'/filters.php';
+require app_path().'/filters.php';