fix record mixing merge conflicts

This commit is contained in:
DizzyEggg
2018-05-19 12:32:44 +02:00
26 changed files with 1631 additions and 2452 deletions

View File

@@ -144,6 +144,7 @@ SECTIONS {
src/naming_screen.o(.text);
src/money.o(.text);
asm/contest_effect.o(.text);
src/record_mixing.o(.text);
asm/record_mixing.o(.text);
src/secret_base.o(.text);
src/tv.o(.text);