From 05ada38d8f6d3642a5d52a668c7b895a1e599a66 Mon Sep 17 00:00:00 2001
From: Shawn McCool <shawn@heybigname.com>
Date: Wed, 11 Jul 2012 22:36:20 +0200
Subject: [PATCH] style update

---
 laravel/documentation/install.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md
index cb3f9dc6..1e051e06 100644
--- 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>