diff options
author | Thierry Vignaud <tv@mageia.org> | 2013-04-15 16:18:07 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2013-04-15 16:18:07 +0000 |
commit | be3f8dec8e24f1034e5c940ab217e85834b2f544 (patch) | |
tree | 438bf5b87e7c06b5f0ffdecd6f6c1ecfd774167c | |
parent | fac72835e8f1160bc931025763f1c1924a899046 (diff) | |
download | drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.tar drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.tar.gz drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.tar.bz2 drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.tar.xz drakx-backup-do-not-use-be3f8dec8e24f1034e5c940ab217e85834b2f544.zip |
fix mismerge
-rw-r--r-- | perl-install/NEWS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 5862040b8..0667eba0e 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -5,7 +5,6 @@ Version 14.21.4 - 15 April 2013 o offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch) - drakclock: o do not crash if timezones cannot be listed (mga#6787) -- fix crashing when a banner icon doesn't exist (mga#5223) Version 14.21.3 - 19 September 2012 |