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.