Fix additional merge conflicts

2024-06-07 21:20:04 -04:00
parent 4382b3e16e
commit 2e4b94d528
1 changed files with 0 additions and 1 deletions
@@ -172,7 +172,6 @@ class FreeplayState extends MusicBeatSubState
  var exitMovers:ExitMoverData = new Map();

  var stickerSubState:StickerSubState;
-  var funnyCam:FunkinCamera;

  public static var rememberedDifficulty:Null<String> = Constants.DEFAULT_DIFFICULTY;
  public static var rememberedSongId:Null<String> = 'tutorial';