From 0848070e9119a86e5182273c5b0cdcd60cb271a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Mon, 29 Mar 2004 11:43:34 +0000
Subject: [PATCH] remove conflict indicators

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8558 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.