resolving merge conflicts.

257d917e · Taylor Otwell · 0f448271 · b5f56840 · 257d917e
Commit 257d917e authored Feb 22, 2012 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

index.php public/index.php +1 -1

No files found.
--- a/public/index.php
+++ b/public/index.php
@@ -31,4 +31,4 @@ unset($web);
 // --------------------------------------------------------------
 // Launch Laravel.
 // --------------------------------------------------------------
-require path('sys').'laravel.php';
\ No newline at end of file
+require path('sys').'laravel.php';