Fix merge conflicts

[bsdgames-darwin.git] / hack / hack.eat.c

diff --git a/hack/hack.eat.c b/hack/hack.eat.c
index a6c404e74962699c413da83b0384cde4249be073..6107f99316f2b888e05f21b45df1194e2d818aff 100644 (file)
--- a/hack/hack.eat.c
+++ b/hack/hack.eat.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.eat.c,v 1.12 2011/08/07 06:03:45 dholland Exp $   */
+/*     $NetBSD: hack.eat.c,v 1.13 2019/02/04 03:33:15 mrg Exp $        */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.eat.c,v 1.12 2011/08/07 06:03:45 dholland Exp $");
+__RCSID("$NetBSD: hack.eat.c,v 1.13 2019/02/04 03:33:15 mrg Exp $");
 #endif                         /* not lint */
 
 #include "hack.h"
@@ -539,7 +539,7 @@ eatcorpse(struct obj *otmp)
                pline("You turn to stone.");
                killer = "dead cockatrice";
                done("died");
-               /* NOTREACHED */
+               break;
        case 'a':
                if (Stoned) {
                        pline("What a pity - you just destroyed a future piece of art!");