diff --git a/src/ChangeLog b/src/ChangeLog
index 29affcef39..5e27f6f39f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -224,7 +224,6 @@
 	* lyxrc.C (setDefaults, getDescription, output, read):
 	* lyxrc.h: remove ps_command
 
->>>>>>> 1.1856
 2004-03-22  Angus Leeming  <leeming@lyx.org>
 
 	* lyx_main.C (error_handler, init): remove handler for SIGPIPE.