From: Reiner Steib <Reiner.Steib@gmx.de>
Date: Sun, 10 Feb 2008 14:08:03 +0000 (+0000)
Subject: Remove bogus merge relicts from previous commit.
X-Git-Tag: emacs-pretest-23.0.90~8042
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eaf6a1df4b1f8e66353096a0baa36eaaafa58ddb;p=emacs.git

Remove bogus merge relicts from previous commit.
---

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 86c432a76c4..a7bdef7b4b7 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -94,26 +94,6 @@ minimized.  I don't know what is left to do here.
 
 ** timh@insightful.com, 9 Nov: X-coding-system incompatibility, and workaround
 
-<<<<<<< FOR-RELEASE
-<<<<<<< FOR-RELEASE
-** Get rid of old-style backquotes in cc-vars.el.
-ttn has a patch:
-http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg02052.html
-
-** Fix or document the shortcoming of easymenu and :suffix.
-http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01857.html
-
-** tool bar icons disappear [in customize buffers]
-http://thread.gmane.org/gmane.emacs.devel/84869
-
-=======
->>>>>>> 1.738
-** Fix problem with mode-name in SGML mode.
-If mode-name stays non-string, add NEWS entry and doc fix.
-http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg02048.html
-
-=======
->>>>>>> 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