Skip to content

S
syncEnrollments
Commit d9bdb4f9 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Fix conflict text.

parent bb4bf88c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
laravel/documentation/changes.md
View file @ d9bdb4f9
...@@ -2,13 +2,10 @@ ...@@ -2,13 +2,10 @@
## 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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment