summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-07-31 14:40:54 +0200
committerHarald Hoyer <harald@redhat.com>2013-07-31 14:40:54 +0200
commit5a08ca24673685b92bc60d2d5a5e82504b8da3bb (patch)
tree0a442e9de86542b8bfeb16ee38701bcfebd40d59
parent6ae84661367ad7c1bfc5cd3960bbf2ca1122ffff (diff)
downloaddracut-5a08ca24673685b92bc60d2d5a5e82504b8da3bb.tar.gz
dracut-5a08ca24673685b92bc60d2d5a5e82504b8da3bb.tar.xz
dracut-5a08ca24673685b92bc60d2d5a5e82504b8da3bb.zip
dracut.spec: changelog merge fixed
-rw-r--r--dracut.spec1
1 files changed, 0 insertions, 1 deletions
diff --git a/dracut.spec b/dracut.spec
index fb2063b..a117c13 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -445,7 +445,6 @@ rm -rf -- $RPM_BUILD_ROOT
%endif
%changelog
-=======
* Wed Jul 31 2013 Harald Hoyer <harald@redhat.com> 031-1
- do not include the resume dracut module in hostonly mode,
if no swap is present