diff --git a/src/ChangeLog b/src/ChangeLog
index d03d40ae..0d471023 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -188,7 +188,6 @@
 	characters.
 	(skip_uname): Ditto.
 
->>>>>>> 1.123
 2001-02-11  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* ftp.c (ftp_loop): Reset con.