mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-15 11:22:55 +00:00
Fix additional merge conflicts
This commit is contained in:
parent
4382b3e16e
commit
2e4b94d528
|
@ -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';
|
||||
|
|
Loading…
Reference in a new issue