diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /hash/snes.xml | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/snes.xml')
-rw-r--r-- | hash/snes.xml | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/hash/snes.xml b/hash/snes.xml index 0fecdc760f8..5e72c499a72 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -2371,24 +2371,6 @@ Beyond that last category are the roms waiting to be classified. </part> </software> - <software name="strikerp1" cloneof="striker"> - <!-- Niiue --> - <description>Striker (Euro, NTSC Prototype)</description> - <year>1993</year> - <publisher>Argonaut Software</publisher> - <part name="cart" interface="snes_cart"> - <feature name="pcb" value="SHVC-1P0N-01" /> - <feature name="u1" value="U1 EPROM" /> - <feature name="u2" value="U2 CIC" /> - <feature name="lockout" value="D411 C127 05B" /> - <feature name="cart_model" value="no shell" /> - <feature name="slot" value="lorom" /> - <dataarea name="rom" size="524288"> - <rom name="striker snes fd6b.u1" size="524288" crc="fce4da63" sha1="92ad4372b7e3fe648e21031f3be60cb156494802" offset="0x000000" /> - </dataarea> - </part> - </software> - <software name="stuntfxp" cloneof="stuntfx"> <!-- Retrology --> <!-- Notes: identical software but significantly different hardware --> |