From 337db549659b93e1d85a60e0fb5016d26f02caaa Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Thu, 6 Aug 2020 17:55:36 -0400 Subject: [PATCH] Missed this in p_setup.c --- src/p_setup.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 090c3b259..09259c64c 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -4152,19 +4152,14 @@ boolean P_AddWadFile(const char *wadfilename) } else if (name[1] == '_') { - CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name); + CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name); mreplaces++; } } else if (name[0] == 'O' && name[1] == '_') { -<<<<<<< HEAD - CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name); - mreplaces++; -======= CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name); digmreplaces++; ->>>>>>> srb2/next } } break;