mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
[svn] Remove stray conflict marker.
This commit is contained in:
parent
f1d534cd8c
commit
d62d112aed
@ -188,7 +188,6 @@
|
|||||||
characters.
|
characters.
|
||||||
(skip_uname): Ditto.
|
(skip_uname): Ditto.
|
||||||
|
|
||||||
>>>>>>> 1.123
|
|
||||||
2001-02-11 Hrvoje Niksic <hniksic@arsdigita.com>
|
2001-02-11 Hrvoje Niksic <hniksic@arsdigita.com>
|
||||||
|
|
||||||
* ftp.c (ftp_loop): Reset con.
|
* ftp.c (ftp_loop): Reset con.
|
||||||
|
Loading…
Reference in New Issue
Block a user