resolving merge conflicts.

This commit is contained in:
Taylor Otwell
2012-02-22 09:00:43 -06:00

View File

@@ -31,4 +31,4 @@ unset($web);
// -------------------------------------------------------------- // --------------------------------------------------------------
// Launch Laravel. // Launch Laravel.
// -------------------------------------------------------------- // --------------------------------------------------------------
require path('sys').'laravel.php'; require path('sys').'laravel.php';