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.