[unifi-lts: 2/2] Fix merge conflicts.
commit e47a852881a5f05bff8ed03a3e18c4b2ca6743c8
Merge: 1c982ce 38e1b73
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Feb 18 15:03:02 2020 -0600
Fix merge conflicts.
unifi-lts.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --cc unifi-lts.spec
index c12a3b3,863868e..ded42dd
--- a/unifi-lts.spec
+++ b/unifi-lts.spec
@@@ -287,9 -281,9 +287,12 @@@ f
%changelog
+* Tue Feb 18 2020 Richard Shaw <hobbes1069(a)gmail.com> - 5.6.42-4
+- Fix Requires for EL 7, fixes RFBZ#5531.
+
+ * Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
5.6.42-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Mon Oct 14 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.6.42-3
- Remove hard dependency on mongodb and document in SETUP.
- Fix Requires for java to comply with guidelines.