[mdadm/f14/master: 21/22] Fix merge error

[Doug Ledford]

commit f0ccf7e8dff6e30bd4695b7b959d063134c0e33c
Author: Doug Ledford <dledford at redhat.com>
Date:   Wed Aug 4 17:15:26 2010 -0400

    Fix merge error

 mdadm.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/mdadm.spec b/mdadm.spec
index ca40354..484438f 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -37,7 +37,6 @@ make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install
-rm -f %{buildroot}/lib/udev/rules.d/64*
 install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor
 install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/99-raid-check
 install -Dp -m 644 %{SOURCE3} %{buildroot}/lib/udev/rules.d/65-md-incremental.rules
@@ -85,7 +84,6 @@ fi
 * Thu Jul 22 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git20100722.2
 - Remove the glibc-static buildreq and don't build the static mdadm since
   we don't install it anyway
-- Remove the udev file since adding it was supposed to be a rawhide only change
 
 * Thu Jul 22 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git20100722.1
 - Change git date format to the correct format (YYYYMMDD)