resolving merge conflicts.

2012-02-22 09:00:43 -06:00
parent 0f448271f6 b5f568404a
commit 257d917e19
1 changed files with 1 additions and 1 deletions
--- a/public/index.php
+++ b/public/index.php
@@ -31,4 +31,4 @@ unset($web);
 // --------------------------------------------------------------
 // Launch Laravel.
 // --------------------------------------------------------------
-require path('sys').'laravel.php';
+require path('sys').'laravel.php';