From: kazuhiko <kazuhiko>
Date: Thu, 5 Oct 2000 13:06:45 +0000 (+0000)
Subject: fix merging mistake...
X-Git-Tag: r21-2-37-utf-2000-0_17-1~87
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c13845d2319d435db88c87f86dc12190558910dd;p=chise%2Fxemacs-chise.git

fix merging mistake...
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 42c283d..68b9ab7 100644
--- 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");