[svn] Remove stray conflict marker.

diff --git a/src/ChangeLog b/src/ChangeLog
index d03d40ae77cb0fd037643f74d0ebece5177289d5..0d471023a7bd1a8d88f0b5bfd1e88401f3cc4b41 100644 (file)
--- 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.