Fix merge conflicts

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

diff --git a/hangman/endgame.c b/hangman/endgame.c
index c329dbd11abeb6e2558a529fd3741dec722faf3f..e9b3fb63654a68b37edb289deb134961ed2b06f8 100644 (file)
--- a/hangman/endgame.c
+++ b/hangman/endgame.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: endgame.c,v 1.5 2003/08/07 09:37:20 agc Exp $  */
+/*     $NetBSD: endgame.c,v 1.6 2012/06/19 05:45:00 dholland Exp $     */

 
 /*
  * Copyright (c) 1983, 1993
 
 /*
  * Copyright (c) 1983, 1993


@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)endgame.c  8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char sccsid[] = "@(#)endgame.c  8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: endgame.c,v 1.5 2003/08/07 09:37:20 agc Exp $");
+__RCSID("$NetBSD: endgame.c,v 1.6 2012/06/19 05:45:00 dholland Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -45,7 +45,7 @@ __RCSID("$NetBSD: endgame.c,v 1.5 2003/08/07 09:37:20 agc Exp $");
  *     Do what's necessary at the end of the game
  */
 void
  *     Do what's necessary at the end of the game
  */
 void

-endgame()
+endgame(void)

 {
        char ch;
 
 {
        char ch;