From d9bdb4f9bab15e35d6c4e084cc1b58d1ae0dc822 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Mon, 30 Apr 2012 11:16:31 -0500
Subject: [PATCH] Fix conflict text.

---
 laravel/documentation/changes.md | 3 ---
 1 file changed, 3 deletions(-)

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