From 6603e566645159b86e80a05a42249f8154450aee Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Oct 2005 10:19:51 +0000
Subject: * 2005-10-08

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index e848452d9..fcadde8b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,7 +60,6 @@ Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
 	  undocumented.
 
->>>>>>> 1.2673.2.1315
 Wed Sep 28 23:09:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb: document update from James Edward Gray II
-- 
cgit