[svn] Remove stray conflict marker.

diff --git a/src/ChangeLog b/src/ChangeLog
index ac688ba59795d90035f8f7224ab387131765977e..fbc0e9d694e7ec955e5e4063958287deb22f3119 100644 (file)
--- 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.