From b14c456deea37287388989913b236dc7a78d719a Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Jun 26 2015 08:56:58 +0000
Subject: fix changelog entry after conflict resolution


---

diff --git a/libiscsi.spec b/libiscsi.spec
index 74768b1..b039c55 100644
--- a/libiscsi.spec
+++ b/libiscsi.spec
@@ -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