Fix merge conflict and update .gitignore

Rebuild to fix FTI
2023-01-31 13:08:41 +10:30 · 2023-01-11 09:41:52 +10:30
2 changed files with 5 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,2 @@
-/angelfish-21.12.tar.xz
+/*.src.rpm
-/angelfish-22.02.tar.xz
+/*.tar.xz
 /angelfish-22.04.tar.xz
 *.src.rpm
 /angelfish-22.06.tar.xz
 /angelfish-22.09.tar.xz
 /angelfish-22.11.tar.xz
 /angelfish-23.01.0.tar.xz
--- a/angelfish.spec
+++ b/angelfish.spec
@ -86,6 +86,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 22.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 * Wed Jan 11 2023 Justin Zobel <justin@1707.io> -
 - Rebuild to fix FTI on Fedora 36
 * Thu Dec 01 2022 Justin Zobel <justin@1707.io> - 22.11-1
 - Update to 22.11
Author	SHA1	Message	Date
Justin Zobel	6b319b46ad	Fix merge conflict and update .gitignore	2023-01-31 13:08:41 +10:30
Justin Zobel	f7c58e1f65	Rebuild to fix FTI	2023-01-11 09:41:52 +10:30