fix merging mistake...

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 42c283d..68b9ab7 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -2744,7 +2744,6 @@ character set.  Recognized properties are:
          signal_simple_error ("Unrecognized property", keyword);
       }
   }
->>>>>>> 1.1.3.20
 
   if (!final)
     error ("'final must be specified");