From e4f1162cb1ccae63c4881eb7ebf239fc0b89c96d Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 6 Jun 2000 10:33:30 +0000
Subject: [PATCH] Fix typo

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

diff --git a/ChangeLog b/ChangeLog
index b0a43505fd..b9327057bd 100644
--- 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
-- 
2.39.5