From d62d112aedfda3feae09aa574818d1b032322e39 Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Tue, 3 Apr 2001 09:19:23 -0700
Subject: [PATCH] [svn] Remove stray conflict marker.

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

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.