コンフリクト！！

k-hatano / tapchord

Chord player for Android smartphone (※ no longer updated. Please see "tapchord-3")

1 stars 0 forks source link

Closed k-hatano closed 8 years ago

k-hatano commented 10 years ago

A conflict occurs at merging master and branch "features/midi_driver"

k-hatano commented 9 years ago

2.x向けはfeatures/legacy、4.x向けはfeatures/midi_driverを使うってことで逃げた的な？

k-hatano commented 8 years ago

features/legacyをfeatures/midi_driverにマージできたので、このIssueはCloseで。