From d3ab29075a285d1b2b78b327fb670cbdb1910977 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 27 Aug 2007 16:52:23 +0000
Subject: remove conflict sign.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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]
-- 
cgit