whitespace changes and remove conflict marker

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9926 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2afe19b4d3cf5ba9b40ea831c53dca35c5b840ad..b7db0cf8758f60db729192079433647348696226 100644 (file)
--- 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!"