From 56f26ca8d9b83fbe37df18a39c1e462c1a8ec9f2 Mon Sep 17 00:00:00 2001
From: Josef Řídký <jridky@redhat.com>
Date: Jan 28 2021 08:14:33 +0000
Subject: Fix merge conflict


---

diff --git a/jasper.spec b/jasper.spec
index 0cf11da..7674bb0 100644
--- a/jasper.spec
+++ b/jasper.spec
@@ -6,7 +6,7 @@
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Version: 2.0.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~frodo/jasper/
@@ -130,9 +130,12 @@ make test -C builder
 
 
 %changelog
-* Thu Jan 28 2021 Josef Ridky <jridky@redhat.com> - 2.0.24-2
+* Thu Jan 28 2021 Josef Ridky <jridky@redhat.com> - 2.0.24-3
 - fix CVE-2021-3272 (#1921328)
 
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jan 25 2021 Josef Ridky <jridky@redhat.com> - 2.0.24-1
 - New upstream release 2.0.24 (#1905690)