fix merge

ee6adc26 · Shawn McCool · a66eb448 · ee6adc26
Commit ee6adc26 authored Jul 11, 2012 by Shawn McCool
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

laravel/documentation/install.md
+0 -4

No files found.
--- 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)