Fix merge conflicts

[bsdgames-darwin.git] / hangman / prman.c

diff --git a/hangman/prman.c b/hangman/prman.c
index f1b2c50de2f0b102e377e37a6e3a8c91a16beb19..6a6572f23d751fbc13114be19ce88364f8b6efe6 100644 (file)
--- a/hangman/prman.c
+++ b/hangman/prman.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: prman.c,v 1.5 2003/08/07 09:37:22 agc Exp $    */
+/*     $NetBSD: prman.c,v 1.6 2012/06/19 05:45:00 dholland Exp $       */
 
 /*-
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)prman.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: prman.c,v 1.5 2003/08/07 09:37:22 agc Exp $");
+__RCSID("$NetBSD: prman.c,v 1.6 2012/06/19 05:45:00 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: prman.c,v 1.5 2003/08/07 09:37:22 agc Exp $");
  *     of incorrect guesses.
  */
 void
-prman()
+prman(void)
 {
        int i;