[polkit-qt] Wrong changelog order after merge

[Martin Briza]

commit 187be0965bff9b90ebde8549224f233d2041940d
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Jul 10 10:57:44 2014 +0200

    Wrong changelog order after merge

 polkit-qt.spec |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/polkit-qt.spec b/polkit-qt.spec
index 47f114c..d253039 100644
--- a/polkit-qt.spec
+++ b/polkit-qt.spec
@@ -104,13 +104,11 @@ install -p -m644 -D %{SOURCE10} %{buildroot}%{rpm_macros_dir}/macros.polkit-qt
 
 
 %changelog
-<<<<<<< HEAD
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.103.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-=======
 * Thu Jul 10 2014 Martin Bříza <mbriza at redhat.com> - 0.112.0-1
 - polkit-qt-1-0.112.0
->>>>>>> f20
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.103.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
 * Sat Feb 01 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.103.0-10
 - -devel: use %%_rpmconfigdir/macros.d (where supported)