# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1078093084 0
# Node ID a37354a6c3264b2ce14b1d1e0a05245291c61ab7
# Parent  8491a6eafd00242e1d1008951ed51b579fec1b07
Resolve CVS conflicts

diff -r 8491a6eafd00 -r a37354a6c326 man/tramp.texi
--- a/man/tramp.texi	Sun Feb 29 22:08:05 2004 +0000
+++ b/man/tramp.texi	Sun Feb 29 22:18:04 2004 +0000
@@ -2298,3 +2298,7 @@
 @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 -r 8491a6eafd00 -r a37354a6c326 man/trampver.texi
--- a/man/trampver.texi	Sun Feb 29 22:08:05 2004 +0000
+++ b/man/trampver.texi	Sun Feb 29 22:18:04 2004 +0000
@@ -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