Fix Merge Conflict

2 years ago · d7b3349611
parent 30bc768330 4caf0db1f5
commit d7b3349611
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -78,3 +78,4 @@
 /kwayland-5.102.0.tar.xz
 /kwayland-5.103.0.tar.xz
 /kwayland-5.104.0.tar.xz
+/kwayland-5.105.0.tar.xz
--- a/kf5-kwayland.spec
+++ b/kf5-kwayland.spec
@ -13,8 +13,8 @@
 %endif

 Name:    kf5-%{framework}
-Version: 5.104.0
-Release: 2%{?dist}
+Version: 5.105.0
+Release: 1%{?dist}
 Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries

 License: GPLv2+
@ -109,6 +109,9 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:


 %changelog
+* Sun Apr 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.105.0-1
+- 5.105.0
+
 * Wed Apr 12 2023 Jan Grulich <jgrulich@redhat.com> - 5.104.0-2
 - Rebuild (qt5)

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (kwayland-5.104.0.tar.xz) = e2d6a30e50486d15dea4b3545827a2f6e501efe1a621a0bf5ff0e22b791530ecc1f044e545fe90a938e08d25a22e7d3267607033db78488206c46d9d77038b0c
+SHA512 (kwayland-5.105.0.tar.xz) = 29f9dfccfc807b2ae7b5df2170ddfdb6dc4ad41e7cbb4e084785a6c0dd8bbf6be2277461fc26461222067ce6ad48fea65f6b016b68d3b19e317205dfa78aa23b