moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Remove stray conflict marker.

Browse Source
This commit is contained in:
hniksic 2002-04-16 13:15:23 -07:00
parent 7953158bce
commit 123034fa83
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

@ -33,7 +33,6 @@
* utils.c: Don't define `SETJMP()', `run_with_timeout_env' or * utils.c: Don't define `SETJMP()', `run_with_timeout_env' or
`abort_run_with_timeout()' when `USE_SIGNAL_TIMEOUT' is undefined. `abort_run_with_timeout()' when `USE_SIGNAL_TIMEOUT' is undefined.
>>>>>>> 1.395
2002-04-15 Hrvoje Niksic <hniksic@arsdigita.com> 2002-04-15 Hrvoje Niksic <hniksic@arsdigita.com>
* host.c (getaddrinfo_with_timeout): New function. * host.c (getaddrinfo_with_timeout): New function.