From ee6adc26d9e651297833fa9a22a678793105de33 Mon Sep 17 00:00:00 2001 From: Shawn McCool Date: Wed, 11 Jul 2012 22:30:38 +0200 Subject: [PATCH] fix merge --- laravel/documentation/install.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md index a3e9bd8e..ae3984dd 100644 --- a/laravel/documentation/install.md +++ b/laravel/documentation/install.md @@ -4,11 +4,7 @@ - [Requirements](#requirements) - [Installation](#installation) -<<<<<<< HEAD -- [Server Configuration: Why Public?](#server-configuration) -======= - [Server Configuration](#server-configuration) ->>>>>>> feature/docs-install - [Basic Configuration](#basic-configuration) - [Environments](#environments) - [Cleaner URLs](#cleaner-urls)