summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-19 16:25:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-19 16:25:30 +0000
commit2f2b8592b7675e4e526abfbb6780b7baf7bac6f0 (patch)
tree84c4fe30901a8bb8479376f27611bd01074ff9d4
parent750db27c6ff88558132a5b2ad4322a377a05ffba (diff)
downloadruby-2f2b8592b7675e4e526abfbb6780b7baf7bac6f0.tar.gz
removed garbage.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab8ff37631..0cc3e32404 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,7 +49,6 @@ Fri Mar 7 00:30:33 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/Win32API/extconf.rb: no need to add gcc options.
->>>>>>> 1.285.2.597
Fri Feb 28 22:53:55 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* win32/win32.c (flock): maps error code.