diff --git a/src/ChangeLog b/src/ChangeLog
index 07d25d9d..d6a89c1a 100644
--- 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