diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /hash/tutor.xml | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'hash/tutor.xml')
-rw-r--r-- | hash/tutor.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hash/tutor.xml b/hash/tutor.xml index 6e2288134e9..e074ec6540d 100644 --- a/hash/tutor.xml +++ b/hash/tutor.xml @@ -88,7 +88,7 @@ Battlefighter (Original) (Unreleased - Prototype Stage) <info name="serial" value="021E"/> <part name="cart" interface="tutor_cart"> <dataarea name="rom" size="0x4000"> - <rom name="Yonnin Majan.bin" size="0x4000" crc="1c2eb2f0" sha1="4e9a0ce55f479c4b1a5fee9320561ce93765c4d7" offset="0" /> <!-- needs splitting into 2 files? there are 2 roms, marked 1 and 2 in the cart?? --> + <rom name="Yonnin Majan.bin" size="0x4000" crc="1c2eb2f0" sha1="4e9a0ce55f479c4b1a5fee9320561ce93765c4d7" offset="0" /> <!-- needs splitting into 2 files? there are 2 roms, marked 1 and 2 in the cart?? --> </dataarea> </part> </software> |