# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1105789738 0
# Node ID eda381049620186d736ef659aeba40525698e7d0
# Parent  83df5808ec6b218d946f563a663cc58d9a69aaf3
Fix commit conflicts.

diff -r 83df5808ec6b -r eda381049620 man/ChangeLog
--- a/man/ChangeLog	Sat Jan 15 02:30:02 2005 +0000
+++ b/man/ChangeLog	Sat Jan 15 11:48:58 2005 +0000
@@ -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.