removed garbage.

nobu · nobu · commit 2f2b8592b767 · 2003-05-19T16:25:30.000Z
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git 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.
