Fix merge conflicts

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

diff --git a/atc/atc.6 b/atc/atc.6
index 88110c67069e4dd6ee10ed39d0dc8c96799eb0c7..dff91db734414ad22360c82db79191a79bbe741e 100644 (file)
--- a/atc/atc.6
+++ b/atc/atc.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: atc.6,v 1.22 2005/09/15 02:09:41 wiz Exp $
+.\"    $NetBSD: atc.6,v 1.24 2015/07/26 22:22:24 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -456,7 +456,7 @@ diagonal.
 # This is the default game.
 
 update = 5;
-newplane = 5;
+newplane = 10;
 width = 30;
 height = 21;
 
@@ -493,7 +493,10 @@ which holds the list of playable games, as well as the games themselves.
 The scores are kept in
 .Pa /var/games/atc_score .
 .Sh AUTHORS
-Ed James, UC Berkeley: edjames@ucbvax.berkeley.edu, ucbvax!edjames
+.An Ed James ,
+UC Berkeley:
+.Aq Mt edjames@ucbvax.berkeley.edu ,
+ucbvax!edjames
 .Pp
 This game is based on someone's description of the overall flavor
 of a game written for some unknown PC many years ago, maybe.