From: hniksic <devnull@localhost>
Date: Tue, 16 Apr 2002 20:15:23 +0000 (-0700)
Subject: [svn] Remove stray conflict marker.
X-Git-Tag: v1.13~1779
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=123034fa831342fab2d1b29f05202afc69db6923

[svn] Remove stray conflict marker.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ac688ba5..fbc0e9d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -33,7 +33,6 @@
 	* utils.c: Don't define `SETJMP()', `run_with_timeout_env' or
 	`abort_run_with_timeout()' when `USE_SIGNAL_TIMEOUT' is undefined.
 
->>>>>>> 1.395
 2002-04-15  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* host.c (getaddrinfo_with_timeout): New function.