From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 15 Jan 2005 11:48:58 +0000 (+0000)
Subject: Fix commit conflicts.
X-Git-Tag: ttn-vms-21-2-B4~2749
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c86abc0b617b1984a47e4245f56ee078679ae5c;p=emacs.git

Fix commit conflicts.
---

diff --git a/man/ChangeLog b/man/ChangeLog
index 6d4265195f8..f0c5307a52b 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -117,10 +117,6 @@
 	* basic.texi (Moving Point): C-e now runs move-end-of-line.
 	(Undo): Doc undo-outer-limit.
 
-2004-12-11  Richard M. Stallman  <rms@gnu.org>
-
-	* Makefile.in (MAKEINFO): Add --force.
-
 2004-12-20  Jay Belanger  <belanger@truman.edu>
 
 	* calc.texi (Types Tutorial): Emphasize that you can't divide by
@@ -146,7 +142,6 @@
 	the standard "The GNU Emacs Manual" in fifth argument of @xref's.
 	(Dealing with HTTP documents): @inforef->@xref.
 
->>>>>>> 1.412
 2004-12-15  Juri Linkov  <juri@jurta.org>
 
 	* mark.texi (Transient Mark, Mark Ring): M-< and other
@@ -163,7 +158,6 @@
 
 	* calc.texi: Fix some TeX definitions.
 
->>>>>>> 1.407
 2004-12-12  Juri Linkov  <juri@jurta.org>
 
 	* misc.texi (FFAP): Add C-x C-r, C-x C-v, C-x C-d,
@@ -177,7 +171,6 @@
 	* mark.texi (Marking Objects): Marking commands also extend the
 	region when mark is active in Transient Mark mode.
 
->>>>>>> 1.403
 2004-12-09  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* reftex.texi (Imprint): Remove erroneous @value's.