]> git.lyx.org Git - features.git/commit
remove conflict indicators
authorJürgen Spitzmüller <spitz@lyx.org>
Mon, 29 Mar 2004 11:43:34 +0000 (11:43 +0000)
committerJürgen Spitzmüller <spitz@lyx.org>
Mon, 29 Mar 2004 11:43:34 +0000 (11:43 +0000)
commit0848070e9119a86e5182273c5b0cdcd60cb271a8
tree4e38e02ff28c93ab1f4e45484a3b54b04afc5d14
parent4072a82b6ea1d9d52457ffcf3dd108f8deaf3db0
remove conflict indicators

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