resolve merge conflict

2017-03-21 13:03:37 +01:00 · 2017-03-21 13:03:37 +01:00 · 95d104d46f
commit 95d104d46f
parent 2f8c339a9f ed1bc54acf
1 changed files with 3 additions and 0 deletions
--- a/filesystem.spec
+++ b/filesystem.spec
@ -278,6 +278,9 @@ restorecon /media 2>/dev/null >/dev/null || :
 - Move to Pagure.io
 - 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
 - refresh lang-exceptions list - /usr/share/locale ownerships
  (#1409402, #1313421)