From: André Pönitz <poenitz@gmx.net>
Date: Fri, 21 Feb 2003 10:02:37 +0000 (+0000)
Subject: remove old >>> markers
X-Git-Tag: 1.6.10~17468
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=01ae17a24d2bb555f4fddcb9b21cd8e4f6dcd49c;p=features.git

remove old >>> markers


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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 3557898afc..1a1c306891 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -249,7 +249,6 @@
 	* layouts/broadway.layout:
 	* layouts/hollywood.layout: remove spurious spaces
 
->>>>>>> 1.351
 2002-12-20  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* mathed.lyx: Removed big delimiters table as they are not symbols.