Fix merge conflict

2 years ago · be70d5b5c1
parent 35205e320d 56905a05fd
commit be70d5b5c1
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -44,3 +44,4 @@
 /frameworkintegration-5.102.0.tar.xz
 /frameworkintegration-5.103.0.tar.xz
 /frameworkintegration-5.104.0.tar.xz
+/frameworkintegration-5.105.0.tar.xz
--- a/kf5-frameworkintegration.spec
+++ b/kf5-frameworkintegration.spec
@ -1,7 +1,7 @@
 %global framework frameworkintegration

 Name:    kf5-%{framework}
-Version: 5.104.0
+Version: 5.105.0
 Release: 2%{?dist}
 Summary: KDE Frameworks 5 Tier 4 workspace and cross-framework integration plugins
 License: LGPLv2+
@ -108,6 +108,9 @@ developing applications that use %{name}.


 %changelog
+* Sun Apr 16 2023 Justin Zobel <justin@1707.io> - 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 (frameworkintegration-5.104.0.tar.xz) = 2c5130b555b93cb72ce36be3708868fd35ebcda0a226e5099efe337477d53f938f066fd35a7e90efddadd3a51f427810b1b412028bbe6222e9208915afa06a74
+SHA512 (frameworkintegration-5.105.0.tar.xz) = ecb819d332864e34b6dd0273afec417135a5c1ea7cbdea2bad9bf33b03eef231df50edb4e6296ed6f04f036746839af45992606a83609f4899944ce69326f839