Fix typo

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

diff --git a/ChangeLog b/ChangeLog
index b0a43505fd3cb9d4ee98e20f211157388a2b7a2d..b9327057bdba1ce74cc6b6ca7ffa43c567485861 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,6 @@
        * src/paragraph.C (String): Correct result for a paragraph inside
        a footnote.
 
->>>>>>> 1.359
 2000-06-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/bufferlist.C (close): test of buf->getuser() == NULL