From: hniksic <devnull@localhost>
Date: Tue, 3 Apr 2001 16:19:23 +0000 (-0700)
Subject: [svn] Remove stray conflict marker.
X-Git-Tag: v1.13~2215
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=d62d112aedfda3feae09aa574818d1b032322e39

[svn] Remove stray conflict marker.
---

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.