anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* lib/ChangeLog: remove svn conflict mark

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@17545 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2007-03-25 12:22:05 +00:00
parent 24a047a7e3
commit 43b96077df
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ChangeLog
View File

@ -82,7 +82,6 @@
* Makefile.am (dist_examples_DATA):
* examples/gl_splash.lyx: new file from José Ramom Flores d'as Seixas.
>>>>>>> .r17491
2006-09-27 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* CREDITS: