From be3f8dec8e24f1034e5c940ab217e85834b2f544 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 15 Apr 2013 16:18:07 +0000 Subject: fix mismerge --- perl-install/NEWS | 1 - 1 file changed, 1 deletion(-) 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 -- cgit v1.2.1