Cleanup, sorry ;-)

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 86821265b985342c76d6af28b4df1aeed30f477d..7ada4a7a012543e391c1e2ac0d0fdab7d0824601 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -16,7 +16,6 @@
        * dociterator.C: include <boost/current_function.hpp>, which is
        needed when assertions are disabled.
 
->>>>>>> 1.2135
 2005-03-05  Johnathan Burchill  <jkerrb@users.sourceforge.net> 
 
        * text2.C: fix for stuck cursor when traversing two