fix record mixing merge conflicts
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user