From 205fe5606697a5ff237336c5ddb062eafa0e969d 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/trunk@9358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index b1eaaa8c3..2eb2cbecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -162,7 +162,6 @@ Sat Sep 24 11:44:28 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* test/net/http/test_http.rb: new file.
 
->>>>>>> 1.4662
 Sat Sep 24 08:54:05 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (cd): no longer accept :noop option, related
-- 
cgit