diff --git a/ChangeLog b/ChangeLog
index 7d8b8e734..5d0328e67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,7 +82,6 @@
 	quite inconsistent with hard disks? Why not /dev/fd[a-z]?)
 	Report by Pavel Roskin.
 	
->>>>>>> 1.258
 2000-06-08  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* docs/tutorial.texi (Network): The body is moved to ...