[svn] Remove stray conflict marker.

diff --git a/src/ChangeLog b/src/ChangeLog
index 07d25d9d3c5ab4bff0ec7475ff48f8fd8cb10313..d6a89c1a78fc806159c57908d44d3e86a5b97142 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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