Merge branch 'master' into f22

Conflicts: kf5-kglobalaccel.spec
10 years ago · dd37478f24
parent 2e1baa3751 7ae9b837f6
commit dd37478f24
1 changed files with 1 additions and 3 deletions
--- a/kf5-kglobalaccel.spec
+++ b/kf5-kglobalaccel.spec
@ -105,13 +105,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 * Mon Mar 16 2015 Daniel Vrátil <dvratil@redhat.com> - 5.8.0-1
 - KDE Frameworks 5.8.0

-<<<<<<< HEAD
 * Fri Feb 27 2015 Daniel Vrátil <dvratil@redhat.com> - 5.7.0-2
 - Rebuild (GCC 5)
-=======
+
 * Fri Feb 20 2015 Rex Dieter <rdieter@fedoraproject.org> 5.7.0-2
 - Conflicts: plasma-workspace < 5.2.0-8
->>>>>>> e3c533b0923f53ea9d1bad2cd37bf5720147998d

 * Mon Feb 16 2015 Daniel Vrátil <dvratil@redhat.com> - 5.7.0-1
 - KDE Frameworks 5.7.0