[python-django] correct last merging error

[Matthias Runge]

commit 0a1abf04c5f1f2b2f2f518c0856e22de3ac27226
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Dec 11 09:59:33 2012 +0100

    correct last merging error

 python-django.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index 8a8426c..0ea9d3e 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -255,7 +255,6 @@ cd tests
 
 
 %changelog
-<<<<<<< HEAD
 * Tue Dec 11 2012 Matthias Runge <mrunge at redhat.com> - 1.4.3-1
 - security update to upstream version 1.4.3
   https://www.djangoproject.com/weblog/2012/dec/10/security/