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
faf77c8f51
commit
278b63093f
@ -22,7 +22,6 @@
|
||||
|
||||
* recur.c (download_child_p): Ditto.
|
||||
|
||||
>>>>>>> 1.382
|
||||
2002-04-12 Hrvoje Niksic <hniksic@arsdigita.com>
|
||||
|
||||
* config.h.in: Define _VA_LIST on Solaris to prevent stdio.h from
|
||||
|
Loading…
Reference in New Issue
Block a user