fixed merge conflict.

This commit is contained in:
Taylor Otwell 2011-08-24 07:23:16 -05:00
commit f580ef7f71

View File

@ -55,4 +55,4 @@ $public = __DIR__;
| 3... 2... 1... Lift-off!
|--------------------------------------------------------------------------
*/
require $laravel.'/laravel.php';
require $laravel.'/laravel.php';