From c13845d2319d435db88c87f86dc12190558910dd Mon Sep 17 00:00:00 2001
From: kazuhiko <kazuhiko>
Date: Thu, 5 Oct 2000 13:06:45 +0000
Subject: [PATCH] fix merging mistake...

---
 src/mule-charset.c |    1 -
 1 file changed, 1 deletion(-)

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");
-- 
1.7.10.4