From 85ec19367d034622f74683049db365fcf5d7113f Mon Sep 17 00:00:00 2001 From: Shawn McCool Date: Wed, 11 Jul 2012 22:31:46 +0200 Subject: [PATCH] fix merge --- laravel/documentation/install.md | 1 - 1 file changed, 1 deletion(-) diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md index ae3984dd..07cfbb4f 100644 --- a/laravel/documentation/install.md +++ b/laravel/documentation/install.md @@ -60,7 +60,6 @@ A very basic example of an Apache VirtualHost configuration for MySite might loo 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 ## Basic Configuration