mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-07 12:32:26 +00:00
remove conflict indicators
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8558 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
4072a82b6e
commit
0848070e91
@ -224,7 +224,6 @@
|
||||
* lyxrc.C (setDefaults, getDescription, output, read):
|
||||
* lyxrc.h: remove ps_command
|
||||
|
||||
>>>>>>> 1.1856
|
||||
2004-03-22 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* lyx_main.C (error_handler, init): remove handler for SIGPIPE.
|
||||
|
Loading…
Reference in New Issue
Block a user