Strip bad comment from conflict

This commit is contained in:
Marc-André Lureau 2017-07-31 15:23:47 +02:00
parent a004c19da9
commit 2164ba3cdc

View File

@ -196,7 +196,7 @@ rm -f %{buildroot}%{_libdir}/*.la
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.33-6 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.33-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
<<<
* Tue Jun 20 2017 Cole Robinson <crobinso@redhat.com> - 0.33-5 * Tue Jun 20 2017 Cole Robinson <crobinso@redhat.com> - 0.33-5
- channel-usbredir: Fix crash on channel-up. Resolves: rhbz#1399838 - channel-usbredir: Fix crash on channel-up. Resolves: rhbz#1399838
- usbutils no longer ships usb.ids, it is hwdata now, set path manually. - usbutils no longer ships usb.ids, it is hwdata now, set path manually.