github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-03-13 03:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn] Remove stray conflict marker.

Browse Source
This commit is contained in:
hniksic 2002-04-12 13:28:05 -07:00
parent faf77c8f51
commit 278b63093f
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

@ -22,7 +22,6 @@
* recur.c (download_child_p): Ditto. * recur.c (download_child_p): Ditto.
>>>>>>> 1.382
2002-04-12 Hrvoje Niksic <hniksic@arsdigita.com> 2002-04-12 Hrvoje Niksic <hniksic@arsdigita.com>
* config.h.in: Define _VA_LIST on Solaris to prevent stdio.h from * config.h.in: Define _VA_LIST on Solaris to prevent stdio.h from