diff options
| author | Miles Bader <miles@gnu.org> | 2004-02-29 22:18:04 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-02-29 22:18:04 +0000 |
| commit | 3f383e4ad7884aad8767d3a6c26c6f3bab5f8f93 (patch) | |
| tree | fdb2074ec38a3c39f3591ca70324d05255df4025 /man | |
| parent | aef3a1f2eb041c10d6e2c8e2c4e03590b6fde0fc (diff) | |
| download | emacs-3f383e4ad7884aad8767d3a6c26c6f3bab5f8f93.tar.gz | |
Resolve CVS conflicts
Diffstat (limited to 'man')
| -rw-r--r-- | man/tramp.texi | 4 | ||||
| -rw-r--r-- | man/trampver.texi | 4 |
2 files changed, 7 insertions, 1 deletions
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 |