From: Miles Bader <miles@gnu.org>
Date: Sun, 29 Feb 2004 22:18:04 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: ttn-vms-21-2-B4~7413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f383e4ad7884aad8767d3a6c26c6f3bab5f8f93;p=emacs.git

Resolve CVS conflicts
---

diff --git a/man/tramp.texi b/man/tramp.texi
index ffc22837b54..7e21b9c691f 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -2298,3 +2298,7 @@ for @value{emacs-other-name}.
 @c ** Use `filename' resp. `file name' consistently.
 @c ** Use `host' resp. `machine' consistently.
 @c ** Consistent small or capitalized words especially in menues.
+
+@ignore
+   arch-tag: f96dd66e-6dd3-4c92-8d77-9c56205ba808
+@end ignore
diff --git a/man/trampver.texi b/man/trampver.texi
index d6b9c73610b..38862115ce9 100644
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -59,4 +59,6 @@
 @c standalone.  That's why it is included from `trampinst.texi'.
 @c Otherwise, '/dev/null/' is taken, which leaves this part empty.
 
-
+@ignore
+   arch-tag: e0fe322c-e06b-46eb-bb5b-d091b521f41c
+@end ignore