From dca135190a7a04b7d1254b66b779c7d45a1911cf Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Tue, 4 Oct 2011 04:28:30 -0700
Subject: [PATCH] Fixed changelog

---
 docs/changelog.rst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a4a7fa9e..71f8e514 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,11 +5,8 @@ Changelog
 Changes in dev
 ==============
 
-<<<<<<< HEAD
-- Added spec file for rpm-based distributions
-=======
 - Updated ComplexFields so if required they won't accept empty lists / dicts
->>>>>>> listfield
+- Added spec file for rpm-based distributions
 - Fixed ListField so it doesnt accept strings
 - Added DynamicDocument and EmbeddedDynamicDocument classes for expando schemas