summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author arbee <rb6502@users.noreply.github.com>2024-11-21 00:03:28 -0500
committer arbee <rb6502@users.noreply.github.com>2024-11-21 00:03:28 -0500
commit25dc6e8aadee32ad0101b448b3878a672123b58c (patch)
tree8011bcdb0fb169848cd9b55799d04ec7de715cdc
parentfa3b85ff8eb2bfdf84fe64a8ab3121ddece4ba5e (diff)
Fix merge conflict from last commit. [R. Belmont]
-rw-r--r--src/mame/mame.lst1
1 files changed, 0 insertions, 1 deletions
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