summaryrefslogtreecommitdiffstatshomepage
path: root/hash/gbcolor.xml
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /hash/gbcolor.xml
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/gbcolor.xml')
-rw-r--r--hash/gbcolor.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/hash/gbcolor.xml b/hash/gbcolor.xml
index 490adeee414..5261c682185 100644
--- a/hash/gbcolor.xml
+++ b/hash/gbcolor.xml
@@ -18312,7 +18312,7 @@ Unreleased (music source code exists, possibly no prototypes exist)
<description>San Francisco Rush 2049 (Euro, USA)</description>
<year>2000</year>
<publisher>Midway</publisher>
- <info name="serial" value="CGB-ASXE-USA, CGB-ASXP-EUU, CGB-ASXP-EUR"/>
+ <info name="serial" value="CGB-ASXE-USA, CGB-ASXP-EUU"/>
<part name="cart" interface="gameboy_cart">
<feature name="pcb" value="DMG-A07-01" />
<feature name="u1" value="U1 2M/4M/8M MROM" />
@@ -20153,7 +20153,7 @@ Unreleased (music source code exists, possibly no prototypes exist)
<description>Sylvester and Tweety - Breakfast on the Run (Euro)</description>
<year>1998</year>
<publisher>Infogrames</publisher>
- <info name="serial" value="DMG-AYRP-NOE, DMG-AYRP-UKV, DMG-AYRP-EUR)"/>
+ <info name="serial" value="DMG-AYRP-(NOE/UKV)"/>
<part name="cart" interface="gameboy_cart">
<feature name="slot" value="rom_mbc5" />
<dataarea name="rom" size="1048576">