Fix conflicts

squidistaken · Jan 21, 2023 · f6a03e1 · f6a03e1
1 parent 357d7c7
commit f6a03e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 53 deletions.
diff --git a/Y1B2 Game.yyp b/Y1B2 Game.yyp
diff --git a/rooms/rm_controls/rm_controls.yy b/rooms/rm_controls/rm_controls.yy