summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2006-06-26 14:37:30 +0000
committerPeter Jones <pjones@redhat.com>2006-06-26 14:37:30 +0000
commit2f4b3724bb790ff5e66d75c146ce6ff4eae317fb (patch)
treef9ccd237c5223f64b479a5288595e35d1b62627d
parent613946658771821baa411056c1c9f085af4eda22 (diff)
downloadanaconda-2f4b3724bb790ff5e66d75c146ce6ff4eae317fb.tar.gz
anaconda-2f4b3724bb790ff5e66d75c146ce6ff4eae317fb.tar.xz
anaconda-2f4b3724bb790ff5e66d75c146ce6ff4eae317fb.zip
- fix cvs merge goofiness
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a5111fff4..681cb9fb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,6 @@
* scripts/upd-instroot (KEEPFILE): Add iscsistart
->>>>>>> 1.1629
2006-06-22 Chris Lumens <clumens@redhat.com>
* isys/isys.c: Removed doIsScsiRemovable and doIsIdeRemovable.