From 25dc6e8aadee32ad0101b448b3878a672123b58c Mon Sep 17 00:00:00 2001
From: arbee <rb6502@users.noreply.github.com>
Date: Thu, 21 Nov 2024 00:03:28 -0500
Subject: Fix merge conflict from last commit. [R. Belmont]

---
 src/mame/mame.lst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 50bc52f0e36..9449e85fda8 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -17734,7 +17734,6 @@ draco                           // (c) 1981 Cidelsa
 
 @source:efo/nightmare.cpp
 nightmare                       // (c) 1982 E.F.O.
-nightmarea                      // (c) 1982 E.F.O.
 
 @source:elektor/avrmax.cpp
 atm18mcc
-- 
cgit v1.2.3