Remove duplication from gconv-modules

diff --git a/ChangeLog b/ChangeLog
index 75c6e9a..e388d0b 100644 (file)
--- 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 d3631c0..b894fec 100644 (file)
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1630,13 +1630,6 @@ 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//
 alias  CSIBM1156//             IBM1156//