From: Andreas Schwab <schwab@suse.de>
Date: Thu, 11 Dec 2014 11:33:15 +0000 (+0100)
Subject: Remove duplication from gconv-modules
X-Git-Tag: glibc-2.21~258
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da5bcaa49916fd99c1cd2bfe11923e680056abd7;p=thirdparty%2Fglibc.git

Remove duplication from gconv-modules
---

diff --git a/ChangeLog b/ChangeLog
index 75c6e9a0ddd..e388d0b88e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-11  Andreas Schwab  <schwab@suse.de>
+
+	* iconvdata/gconv-modules: Remove duplicate entry.
+
 2014-12-11  Will Newton  <will.newton@linaro.org>
 
 	Merge gettext 0.19.3 into intl/.
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index d3631c0bf4e..b894fec4758 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1629,13 +1629,6 @@ alias	CSIBM1155//		IBM1155//
 module	IBM1155//		INTERNAL		IBM1155		1
 module	INTERNAL		IBM1155//		IBM1155		1
 
-#	from			to			module		cost
-alias	IBM-1155//		IBM1155//
-alias	CP1155//		IBM1155//
-alias	CSIBM1155//		IBM1155//
-module	IBM1155//		INTERNAL		IBM1155		1
-module	INTERNAL		IBM1155//		IBM1155		1
-
 #	from			to			module		cost
 alias	IBM-1156//		IBM1156//
 alias	CP1156//		IBM1156//