resolving merge conflicts.

davidcoallier · Feb 22, 2012 · 257d917 · 257d917
2 parents 0f44827 + b5f5684
commit 257d917
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/public/index.php b/public/index.php
@@ -31,4 +31,4 @@
 // --------------------------------------------------------------
 // Launch Laravel.
 // --------------------------------------------------------------
-require path('sys').'laravel.php';
+require path('sys').'laravel.php';