From 123034fa831342fab2d1b29f05202afc69db6923 Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Tue, 16 Apr 2002 13:15:23 -0700
Subject: [PATCH] [svn] Remove stray conflict marker.

---
 src/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.