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 3557898afc74011d81bc8f958c26b81143e85c89..1a1c306891ffcee38b6795ceb01c5caf8eaf33c5 100644 (file)
--- 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.