summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-29 14:38:32 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-29 14:38:32 +0000
commit6a07a8cbb582e1a42e68c4b1d6bc184a8befdcc3 (patch)
tree70342db7be96deaf7b92640a9f76512a520762e7
parent9aa36880e1b825a357e5ada102ead915ff39c239 (diff)
* ChangeLog: remove junk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ea0e8bc89..fb8723cc43 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>