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

remove conflict indicators

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8558 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2004-03-29 11:43:34 +00:00
parent 4072a82b6e
commit 0848070e91
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ChangeLog
View File

@ -224,7 +224,6 @@
* lyxrc.C (setDefaults, getDescription, output, read): * lyxrc.C (setDefaults, getDescription, output, read):
* lyxrc.h: remove ps_command * lyxrc.h: remove ps_command
>>>>>>> 1.1856
2004-03-22 Angus Leeming <leeming@lyx.org> 2004-03-22 Angus Leeming <leeming@lyx.org>
* lyx_main.C (error_handler, init): remove handler for SIGPIPE. * lyx_main.C (error_handler, init): remove handler for SIGPIPE.