Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

This commit is contained in:
Shawn McCool 2012-07-11 22:30:38 +02:00
parent a66eb44809
commit ee6adc26d9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/documentation/install.md
View File

@ -4,11 +4,7 @@ ## Contents
- [Requirements](#requirements) - [Requirements](#requirements)
- [Installation](#installation) - [Installation](#installation)
<<<<<<< HEAD
- [Server Configuration: Why Public?](#server-configuration)
=======
- [Server Configuration](#server-configuration) - [Server Configuration](#server-configuration)
>>>>>>> feature/docs-install
- [Basic Configuration](#basic-configuration) - [Basic Configuration](#basic-configuration)
- [Environments](#environments) - [Environments](#environments)
- [Cleaner URLs](#cleaner-urls) - [Cleaner URLs](#cleaner-urls)