fix changelog entry after conflict resolution

This commit is contained in:
Paolo Bonzini 2015-06-26 10:56:58 +02:00
parent 0d5b586ae8
commit b14c456dee

View File

@ -97,7 +97,7 @@ The libiscsi-devel package includes the header files for libiscsi.
%{_libdir}/pkgconfig/libiscsi.pc
%changelog
* Sat May 16 2015 Neal Gompa <ngompa13@gmail.com> - 1.15.0-1
* Fri Jun 26 2015 Neal Gompa <ngompa13@gmail.com> - 1.15.0-1
- Rebased to version 1.15.0
- Removed patch 20 as it has been upstreamed
- Disabled patch 12 as need for revised one is in question