fixed merge conflicts.

2011-08-25 23:02:12 -05:00
parent 1e7850d9ba c1131e1882
commit 46dd65fa74
2 changed files with 9 additions and 1 deletions
--- a/public/index.php
+++ b/public/index.php
@@ -36,4 +36,4 @@ $public      = __DIR__;
 | 3... 2... 1... Lift-off!
 |--------------------------------------------------------------------------
 */
-require $laravel.'/laravel.php';
+require $laravel.'/laravel.php';