fix merge

2012-07-11 22:31:46 +02:00 · 2012-07-11 22:31:46 +02:00 · 85ec19367d
parent ee6adc26d9
commit 85ec19367d
1 changed files with 0 additions and 1 deletions
--- a/laravel/documentation/install.md
+++ b/laravel/documentation/install.md
@ -60,7 +60,6 @@ ## Server Configuration
 Notice that while we installed to **/Users/JonSnow/Sites/MySite** our DocumentRoot points to /Users/JonSnow/Sites/MySite/public**.

 While pointing the DocumentRoot to the public folder is a commonly used best-practice, it's possible that you may need to use Laravel on a host that does not allow you to update your DocumentRoot. A collection of algorithms to circumvent this need can be found [http://forums.laravel.com/viewtopic.php?id=1258](on the Laravel forums.)
->>>>>>> feature/docs-install

 <a name="basic-configuration"></a>
 ## Basic Configuration