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/ekara_japan_web.xml | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/ekara_japan_web.xml')
-rw-r--r-- | hash/ekara_japan_web.xml | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/hash/ekara_japan_web.xml b/hash/ekara_japan_web.xml index 9ba3f9f10b9..d0c1a75fd51 100644 --- a/hash/ekara_japan_web.xml +++ b/hash/ekara_japan_web.xml @@ -28,17 +28,4 @@ </part> </software> - <!-- this one has some songs programmed into it (TODO, list them here for reference) --> - - <software name="ekaraweb12a"> - <description>e-kara Web cartridge 12M (used, with 7 Songs) (Japan)</description> - <year>2003</year> - <publisher>Takara</publisher> - <part name="cart" interface="ekara_cart"> - <dataarea name="rom" size="0x100000"> - <rom name="ekaraweb3.bin" size="0x100000" crc="a6a095b9" sha1="709d7edb5799b97127502408bec698663b902462" offset="0" /> - </dataarea> - </part> - </software> - </softwarelist> |