From 5aaf902724b76110b89dc01f727f4034483d4a4a Mon Sep 17 00:00:00 2001
From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Mon, 9 May 2005 17:43:13 +0000
Subject: [PATCH] whitespace changes and remove conflict marker

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9926 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ChangeLog | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2afe19b4d3..b7db0cf875 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -28,8 +28,8 @@
 
 2005-04-28  Michael Schmitt  <michael.schmitt@teststep.org>
 
-        * layouts/*.layout: 
-        * layouts/*.inc: All Style, NoStyle and CopyStyle commands 
+	* layouts/*.layout:
+	* layouts/*.inc: All Style, NoStyle and CopyStyle commands
 	use a _ for spaces instead of quotes
 
 2005-04-25  Martin Vermeer  <martin.vermeer@hut.fi>
@@ -111,7 +111,6 @@
 	* reLyX/syntax.default: update natbib/jurabib commands, add
 	\DescribeMacro, \let, \subfigure and bibunit commands
 
->>>>>>> 1.685
 2005-02-20  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* layouts/stdlayouts.inc: change labelstring to "Senseless!"
-- 
2.39.2