resolve merge conflict
This commit is contained in:
commit
95d104d46f
@ -278,6 +278,9 @@ restorecon /media 2>/dev/null >/dev/null || :
|
|||||||
- Move to Pagure.io
|
- Move to Pagure.io
|
||||||
- add ownership for /usr/share/metainfo/ (#1434008)
|
- add ownership for /usr/share/metainfo/ (#1434008)
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-40
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Jan 02 2017 Ondrej Vasik <ovasik@redhat.com> - 3.2-39
|
* Mon Jan 02 2017 Ondrej Vasik <ovasik@redhat.com> - 3.2-39
|
||||||
- refresh lang-exceptions list - /usr/share/locale ownerships
|
- refresh lang-exceptions list - /usr/share/locale ownerships
|
||||||
(#1409402, #1313421)
|
(#1409402, #1313421)
|
||||||
|
Loading…
Reference in New Issue
Block a user