fixed merge conflicts.

2011-09-14 20:58:27 -05:00
parent 6becbaba51 6904cf119d
commit 5196d015b8
2 changed files with 11 additions and 11 deletions
--- a/public/index.php
+++ b/public/index.php
@@ -48,4 +48,4 @@ $public      = __DIR__;
 | 3... 2... 1... Lift-off!
 |--------------------------------------------------------------------------
 */
-require $laravel.'/laravel.php';
+require $laravel.'/laravel.php';