fixed merge conflict.

2011-08-24 07:23:16 -05:00
parent a9f6fbd75a 4072b54f50
commit f580ef7f71
1 changed files with 1 additions and 1 deletions
--- a/public/index.php
+++ b/public/index.php
@@ -55,4 +55,4 @@ $public      = __DIR__;
 | 3... 2... 1... Lift-off!
 |--------------------------------------------------------------------------
 */
-require $laravel.'/laravel.php';
+require $laravel.'/laravel.php';