Commit 3053d486 authored by Taylor Otwell's avatar Taylor Otwell

Fix conflict.

parents 0293eace c1ab700b
...@@ -78,4 +78,4 @@ App::down(function() ...@@ -78,4 +78,4 @@ App::down(function()
| |
*/ */
require app_path().'/filters.php'; require app_path().'/filters.php';
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment