From 5a08ca24673685b92bc60d2d5a5e82504b8da3bb Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Jul 31 2013 12:40:54 +0000 Subject: dracut.spec: changelog merge fixed --- 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 031-1 - do not include the resume dracut module in hostonly mode, if no swap is present