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/msx1_cart.xml | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'hash/msx1_cart.xml')
-rw-r--r-- | hash/msx1_cart.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hash/msx1_cart.xml b/hash/msx1_cart.xml index 7d124b4a064..1fdb0f9707f 100644 --- a/hash/msx1_cart.xml +++ b/hash/msx1_cart.xml @@ -10324,8 +10324,8 @@ kept for now until finding out what those bytes affect... <feature name="slot" value="konami_scc" /> <feature name="mapper" value="KONAMI-SCC" /> <dataarea name="rom" size="32768"> -<!-- Original Dump from an 39SF010 flashrom - 128kb Image. 32KB Rom file cropped out of image after discarding unused area (FF) - <rom name="roc'n rope.bin" size="131072" crc="a71c2009" sha1="4429fe7090953dd509feccafd87ea4e8deb6360f" offset="0" /> --> + <!-- Original Dump from an 39SF010 flashrom - 128kb Image. 32KB Rom file cropped out of image after discarding unused area (FF) + <rom name="roc'n rope.bin" size="131072" crc="a71c2009" sha1="4429fe7090953dd509feccafd87ea4e8deb6360f" offset="0" /> --> <rom name="roc'n rope.rom" size="32768" crc="c0c32c3e" sha1="74b2dbb51437b531ca78c314d666aabe0fd2e177" offset="0" /> </dataarea> </part> |