1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a3ea4f7e..faff60a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,7 +54,6 @@ Mon Aug 27 15:56:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (sym_encoding): return the encoding of a Symbol.
 
->>>>>>> .r13289
 Mon Aug 27 15:33:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* util.c (IEEE_BIG_ENDIAN): use configured value.  [ruby-dev:31623]