summaryrefslogtreecommitdiffstats
path: root/perl-install/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/ChangeLog')
-rw-r--r--perl-install/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index f9d177b84..75efebfac 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -40,7 +40,6 @@
* partition_table_sun.pm: fixed a bug when reading partition table
with unused partition in the middle of the table.
->>>>>>> 1.114
2000-05-23 François Pons <fpons@mandrakesoft.com>
* common.pm: update arch to take into account sparc and sparc64. added