Fix merge conflicts

[bsdgames-darwin.git] / rogue / rogue.6

diff --git a/rogue/rogue.6 b/rogue/rogue.6
index f049c2d1a0b5b506a0a716ffbb99173c7b732bb4..4598c7b44a30c5d0ae13f9283e8d9fbb600cc0c2 100644 (file)
--- a/rogue/rogue.6
+++ b/rogue/rogue.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: rogue.6,v 1.10 2003/08/07 09:37:39 agc Exp $
+.\"    $NetBSD: rogue.6,v 1.11 2005/09/15 02:09:41 wiz Exp $
 .\"
 .\" Copyright (c) 1988, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -81,11 +81,6 @@ For more detailed directions, read the document
 .Rs
 .%T A Guide to the Dungeons of Doom
 .Re
-.Sh AUTHORS
-Timothy Stoehr,
-Michael C. Toy,
-Kenneth C. R. C. Arnold,
-Glenn Wichman
 .Sh FILES
 .Bl -tag -width /var/games/rogue.scores -compact
 .It Pa /var/games/rogue.scores
@@ -99,6 +94,11 @@ Default save file
 .%A Kenneth C. R. C. Arnold
 .%T A guide to the Dungeons of Doom
 .Re
+.Sh AUTHORS
+.An Timothy Stoehr
+.An Michael C. Toy
+.An Kenneth C. R. C. Arnold
+.An Glenn Wichman
 .Sh BUGS
 Probably infinite, although none are known.
 However, that Ice Monsters sometimes transfix you permanently is