X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChangeLog;h=7ada4a7a012543e391c1e2ac0d0fdab7d0824601;hb=794ed6c13c5741646c789e4f4691b74fa41144e2;hp=86821265b985342c76d6af28b4df1aeed30f477d;hpb=ee1163d8e8cbe814912f3498f42fa65a55f22bb7;p=lyx.git

diff --git a/src/ChangeLog b/src/ChangeLog
index 86821265b9..7ada4a7a01 100644
--- 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