From 0afc6e3f4ff543562b08c0ebe72b4d08fe499646 Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 4 Oct 2003 18:48:32 +0000
Subject: [PATCH] delete CVS confliction indicator. sorry.

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

diff --git a/ChangeLog b/ChangeLog
index 5d7a166305..390ff37cde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,6 @@ Sun Oct  5 02:12:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: exit from a thread using 'break'.
 
->>>>>>> 1.2257
 Sat Oct  4 21:49:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* gc.c (Init_stack): the type of space is changed to unsigned int