[python-django-horizon] forgotten <<HEAD from merge

Mon Feb 3 20:59:59 UTC 2014

commit e91461f23161f33a32efa450dfa6e77c24210caf
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Feb 3 22:00:26 2014 +0100

    forgotten <<HEAD from merge

 python-django-horizon.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---

diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 25e8b64..ba99fbb 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 %global with_compression 1
 Name:       python-django-horizon
 Version:    2014.1
