From 351ac75e9f5498ca17b237dafc04a8232cdf3cde Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 4 Oct 2006 22:14:53 +0000
Subject: fix mismerge

---
 initscripts.spec | 1 +
 1 file changed, 1 insertion(+)

(limited to 'initscripts.spec')

diff --git a/initscripts.spec b/initscripts.spec
index 0f33613e..4d507bfd 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -208,6 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 - rc.sysinit: redirect stderr from setsysfont (#209204, indirectly)
 - rwtab: fix iscsi file location (#208864)
 - translation updates: el, da, as, or
+- fix stateless updates (#206331, <law@redhat.com>)
 
 * Wed Sep 27 2006 Bill Nottingham <notting@redhat.com> 8.43-1
 - move ccwgroup initialization to a udev rule (should fix #199139,
-- 
cgit v1.2.1