Fix merge conflicts

[bsdgames-darwin.git] / larn / regen.c

diff --git a/larn/regen.c b/larn/regen.c
index efeefca5184af7de4e0648511b630af7c16e882e..2c8537f8058066d42310261a5bf587cb67fa82e0 100644 (file)
--- a/larn/regen.c
+++ b/larn/regen.c
@@ -1,9 +1,9 @@
-/*     $NetBSD: regen.c,v 1.5 1997/10/18 20:03:43 christos Exp $       */
+/*     $NetBSD: regen.c,v 1.6 2012/06/19 05:30:44 dholland Exp $       */
 
 /* regen.c                     Larn is copyrighted 1986 by Noah Morgan. */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: regen.c,v 1.5 1997/10/18 20:03:43 christos Exp $");
+__RCSID("$NetBSD: regen.c,v 1.6 2012/06/19 05:30:44 dholland Exp $");
 #endif                         /* not lint */
 
 #include "header.h"
@@ -17,7 +17,7 @@ __RCSID("$NetBSD: regen.c,v 1.5 1997/10/18 20:03:43 christos Exp $");
        subroutine to regenerate player hp and spells
  */
 void
-regen()
+regen(void)
 {
        int    i, flag;
        long  *d;