djhackersdev / bemanitools

Runs recent Konami arcade games and emulates various arcade hardware.
The Unlicense
77 stars 15 forks source link

Add bi2a-iidx support for aciotest #263

Closed MatryoshkaLJY closed 8 months ago

icex2 commented 9 months ago

"This branch cannot be rebased due to conflicts"

Not sure where the conflicts are. It doesn't mention any specific files. Can you check on your end if you are up to date with djhackersdev:master and fix that if needed?

Otherwise, I can't merge it.

icex2 commented 8 months ago

Thanks for following up. Merged.