[entangle] Remove merge conflict in changelog

[Daniel P. Berrange]

commit 22813956a7fefc1780cf79dffeaa31fb44ed53ec
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Sat Feb 1 08:58:35 2014 +0100

    Remove merge conflict in changelog

 entangle.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/entangle.spec b/entangle.spec
index 2fbe61f..490b08a 100644
--- a/entangle.spec
+++ b/entangle.spec
@@ -115,13 +115,8 @@ glib-compile-schemas /usr/share/glib-2.0/schemas ||:
 %dir %{_datadir}/%{name}/plugins
 
 %changelog
-<<<<<<< HEAD
-* Wed Jan 22 2014 Jon Ciesla <limburgher at gmail.com> - 0.5.4-2
-- Rebuild for new LibRaw.
-=======
 * Wed Jan 22 2014 Daniel P. Berrange <berrange at redhat.com> - 0.5.4-2
 - Rebuild for new LibRaw
->>>>>>> 31bfe15b91e74d901add5130d8dbddcd02071d50
 
 * Sun Dec 15 2013 Daniel P. Berrange <berrange at redhat.com> - 0.5.4-1
 - Update to 0.5.4 release