moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

[svn] Remove stray conflict marker.

This commit is contained in:
hniksic 2001-04-03 09:19:23 -07:00
parent f1d534cd8c
commit d62d112aed
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ChangeLog
View File

@ -188,7 +188,6 @@
characters.
(skip_uname): Ditto.
>>>>>>> 1.123
2001-02-11 Hrvoje Niksic <hniksic@arsdigita.com>
* ftp.c (ftp_loop): Reset con.