style update

2012-07-11 22:36:20 +02:00 · 2012-07-11 22:36:20 +02:00 · 05ada38d8f
parent 95bb9dfee8
commit 05ada38d8f
1 changed files with 0 additions and 4 deletions
--- a/laravel/documentation/install.md
+++ b/laravel/documentation/install.md
@ -41,10 +41,6 @@ ### Problems?

 - Make sure the **public** directory is the document root of your web server. (see: Server Configuration below)
 - If you are using mod_rewrite, set the **index** option in **application/config/application.php** to an empty string.
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> hotfix/fix_markdown
 - Verify that your storage folder and the folders within are writable by your web server.

 <a name="server-configuration"></a>