Tidying.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c6e769ba043405537524961bf888300e3be23ee..a18c1835fd2775dd5fcc645e39416662713a03d4 100644 (file)
--- 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.