resolve merge conflict vs f30

f41
Caolán McNamara 6 years ago
parent fd556ea5b3
commit 04f7d5cbbe

@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.2 Version: %{libo_version}.2
Release: 2%{?libo_prerelease}%{?dist} Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/ URL: http://www.libreoffice.org/
@ -2120,9 +2120,12 @@ done
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Tue Mar 12 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.2.1.2-2 * Tue Mar 12 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.2.1.2-3
- currency menu too narrow - currency menu too narrow
* Thu Mar 07 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.2.1.2-2
- bump n-v-r
* Sat Mar 02 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.2.1.2-1 * Sat Mar 02 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.2.1.2-1
- latest stable - latest stable

Loading…
Cancel
Save