Browse Source

fixed merge conflict.

Taylor Otwell 13 years ago
parent
commit
f580ef7f71
1 changed files with 1 additions and 1 deletions
  1. 1 1
      public/index.php

+ 1 - 1
public/index.php

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