Commit eaf6a1df authored by Reiner Steib's avatar Reiner Steib
Browse files

Remove bogus merge relicts from previous commit.

parent e8455367
......@@ -94,26 +94,6 @@ minimized. I don't know what is left to do here.
**, 9 Nov: X-coding-system incompatibility, and workaround
** Get rid of old-style backquotes in cc-vars.el.
ttn has a patch:
** Fix or document the shortcoming of easymenu and :suffix.
** tool bar icons disappear [in customize buffers]
>>>>>>> 1.738
** Fix problem with mode-name in SGML mode.
If mode-name stays non-string, add NEWS entry and doc fix.
>>>>>>> 1.748
** multi-tty does not work correctly.
If the server is started from a tty frame and emacsclient creates an
X11 frame, the tty frame gets confused, it thinks it is an X11 frame
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment