Commit 257d917e authored by Taylor Otwell's avatar Taylor Otwell

resolving merge conflicts.

parents 0f448271 b5f56840
...@@ -31,4 +31,4 @@ unset($web); ...@@ -31,4 +31,4 @@ unset($web);
// -------------------------------------------------------------- // --------------------------------------------------------------
// Launch Laravel. // Launch Laravel.
// -------------------------------------------------------------- // --------------------------------------------------------------
require path('sys').'laravel.php'; require path('sys').'laravel.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