fixed merge conflict.

f580ef7f · Taylor Otwell · a9f6fbd7 · 4072b54f · f580ef7f
Commit f580ef7f authored Aug 24, 2011 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 2 deletions

public/index.php
+1 -2

No files found.
--- a/public/index.php
+++ b/public/index.php
@@ -55,4 +55,4 @@ $public      = __DIR__;
 | 3... 2... 1... Lift-off!
 |--------------------------------------------------------------------------
 */
-require $laravel.'/laravel.php';
\ No newline at end of file
+require $laravel.'/laravel.php';