[unifi: 2/2] Fix merge conflicts.
commit c709f95524d8deb91e4c42c46caa12cbed738ed5
Merge: 66ae52b fc85bef
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Mar 16 16:29:50 2020 -0500
Fix merge conflicts.
unifi.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --cc unifi.spec
index 9a8e8ef,899ef08..a0c18b6
--- a/unifi.spec
+++ b/unifi.spec
@@@ -283,9 -283,9 +283,12 @@@ f
%changelog
+* Mon Mar 16 2020 Richard Shaw <hobbes1069(a)gmail.com> - 5.12.35-2
+- Update java requires to work with change in java provides in Fedora.
+
+ * Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
5.12.35-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Tue Dec 03 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.12.35-1
- Update to 5.12.0.