summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Brian Troha <briantro@users.noreply.github.com>2008-05-03 21:36:57 +0000
committer Brian Troha <briantro@users.noreply.github.com>2008-05-03 21:36:57 +0000
commitfe9968afd0d0dbc1b64b6db76c626417081d104b (patch)
treea521df36d3e8b5f2fef9d48d90d7caf667b11437 /src
parent177cee8202f5090dbc1ebae59bdb3cbab712d198 (diff)
removes code clash from SVN revision merge
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/meritm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index b1359f32a39..3873f59206b 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -1112,7 +1112,6 @@ ROM_START( megat3 )
ROM_LOAD( "9255-01_u36-r0", 0x100000, 0x080000, CRC(96bb501e) SHA1(f48ef238e8543676c42e3b85464a25ac179dcdd1) ) /* Location U36 */
ROM_RELOAD( 0x180000, 0x080000)
ROM_LOAD( "9255-01_u37-r0", 0x200000, 0x100000, CRC(273560bd) SHA1(5de8b9f5a7c4b676f131dd7d47ec71d35fa1755c) ) /* Location U37 */
- ROM_RELOAD( 0x280000, 0x080000)
ROM_LOAD( "9255-20-01_u38-rof", 0x300000, 0x080000, CRC(85f48b91) SHA1(7a38644ac7ee55a254c037122af919fb268744a1) ) /* Location U38 */
ROM_RELOAD( 0x380000, 0x080000)