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

Fix conflict text.

This commit is contained in:
Taylor Otwell 2012-04-30 11:16:31 -05:00
parent bb4bf88c6f
commit d9bdb4f9ba
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
laravel/documentation/changes.md
View File

@ -2,13 +2,10 @@ # Laravel Change Log
## Contents ## Contents
<<<<<<< HEAD:laravel/documentation/changes.md
- [Laravel 3.2](#3.2) - [Laravel 3.2](#3.2)
- [Upgrading From 3.1](#upgrade-3.2) - [Upgrading From 3.1](#upgrade-3.2)
=======
- [Laravel 3.1.9](#3.1.9) - [Laravel 3.1.9](#3.1.9)
- [Upgrading From 3.1.8](#upgrade-3.1.9) - [Upgrading From 3.1.8](#upgrade-3.1.9)
>>>>>>> master:changes.md
- [Laravel 3.1.8](#3.1.8) - [Laravel 3.1.8](#3.1.8)
- [Upgrading From 3.1.7](#upgrade-3.1.8) - [Upgrading From 3.1.7](#upgrade-3.1.8)
- [Laravel 3.1.7](#3.1.7) - [Laravel 3.1.7](#3.1.7)