[Emacs-diffs] /srv/bzr/emacs/trunk r102699: Fix 2010-04-19 merge error in doc/emacs/maintaining.texi (Bug#7674).

[Chong Yidong]

------------------------------------------------------------
revno: 102699
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2010-12-21 15:10:31 +0800
message:
  Fix 2010-04-19 merge error in doc/emacs/maintaining.texi (Bug#7674).
modified:
  doc/emacs/maintaining.texi

=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi        2010-11-27 20:04:57 +0000
+++ b/doc/emacs/maintaining.texi        2010-12-21 07:10:31 +0000
@@ -2288,10 +2288,6 @@
   You can also use the collection of tag names to complete a symbol
 name in the buffer.  @xref{Symbol Completion}.
 
address@hidden
address@hidden emerge-xtra.texi
address@hidden ifnottex
-
 @node EDE
 @section Emacs Development Environment
 @cindex EDE (Emacs Development Environment)
@@ -2355,6 +2351,10 @@
 (@code{ede-compile-project}).  EDE uses the file types to guess how
 the target should be built.
 
address@hidden
address@hidden emerge-xtra.texi
address@hidden ifnottex
+
 @ignore
    arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb
 @end ignore