Browse Source

fix merge

Shawn McCool 12 years ago
parent
commit
ee6adc26d9
1 changed files with 0 additions and 4 deletions
  1. 0 4
      laravel/documentation/install.md

+ 0 - 4
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)