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/tutor.xml | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
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 e074ec6540d..6e2288134e9 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> |