Fix conflict.

3053d486 · Taylor Otwell · 0293eace · c1ab700b · 3053d486
Commit 3053d486 authored Dec 11, 2013 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

global.php app/start/global.php +1 -1

No files found.
--- a/app/start/global.php
+++ b/app/start/global.php
@@ -78,4 +78,4 @@ App::down(function()
 |
 */

-require app_path().'/filters.php';
\ No newline at end of file
+require app_path().'/filters.php';