Resolve merge conflict from mass rebuild.

6bafe5b1 · Nathan Scott · bcfed061 · 19e43365 · 6bafe5b1
Commit 6bafe5b1 authored Sep 26, 2019 by Nathan Scott
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

redis.spec redis.spec +3 -0

No files found.
--- a/redis.spec
+++ b/redis.spec
@@ -275,6 +275,9 @@ exit 0
 * Thu Sep 26 2019 Nathan Scott <nathans@redhat.com> - 5.0.6-1
 - Upstream 5.0.6 release and redis-doc updates.

+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Mon Jul 15 2019 Nathan Scott <nathans@redhat.com> - 5.0.5-2
 - Use the (modified) bundled jemalloc for defrag (RHBZ #1725852)