Fixed changelog

2011-10-04 04:28:30 -07:00
parent aedcf3dc81
commit dca135190a
1 changed files with 1 additions and 4 deletions
--- 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