From 22f78d309833adaf7ce300121bc37591ca38cca7 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 29 Dec 2004 14:38:32 +0000
Subject: * ChangeLog: remove junk.

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

diff --git a/ChangeLog b/ChangeLog
index 1ea0e8bc8..fb8723cc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,7 +62,6 @@ Mon Dec 27 15:21:07 2004  Minero Aoki  <aamine@loveruby.net>
 	  (backport from HEAD 1.48)
 
 	* lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
->>>>>>> 1.3892
 	  platforms. (backport from HEAD 1.48)
 
 Sat Dec 25 11:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-- 
cgit