From: Glenn Morris <rgm@gnu.org>
Date: Fri, 7 Dec 2007 04:33:41 +0000 (+0000)
Subject: Tidying.
X-Git-Tag: emacs-pretest-23.0.90~9031
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e74d83ee49cac55f1833d8fba8d735a31a99daa4;p=emacs.git

Tidying.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c6e769ba04..a18c1835fd2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,7 +6,7 @@
 	* textmodes/ispell.el (ispell-process-line):
 	* progmodes/vhdl-mode.el (vhdl-template-modify):
 	* progmodes/idlw-shell.el (idlwave-shell-send-command)
-	(idlwave-shell-display-line)
+	(idlwave-shell-display-line):
 	* progmodes/ada-xref.el (ada-find-file, ada-get-all-references)
 	(ada-xref-find-in-modified-ali, ada-find-in-src-path):
 	* net/trampver.el (x):
@@ -87,7 +87,6 @@
 	event of a verification failure.
 
 2007-12-05  Reiner Steib  <Reiner.Steib@gmx.de>
->>>>>>> 1.12380
 
 	* net/tls.el (tls-program): Provide more custom choices from
 	`tls-checktrust'.  Refer to `tls-checktrust' in doc string.