From 7d6453ac9cf7cb893cafa4017988da73b5a01ac2 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sun, 18 Jun 2000 13:59:32 +0000
Subject: [PATCH] I forgot to remove a conflict indicator.

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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 ...