# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1197002021 0
# Node ID 362f7ff753a38e9a13837563b6e42ef4602c65f4
# Parent  34eaaef9e76dba257dc44777624efdfc4136ffe7
Tidying.

diff -r 34eaaef9e76d -r 362f7ff753a3 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 07 04:28:30 2007 +0000
+++ b/lisp/ChangeLog	Fri Dec 07 04:33:41 2007 +0000
@@ -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.