Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 03:25:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

ree

Browse source
This commit is contained in:
Cameron Taylor 2023-06-09 16:03:45 -04:00
parent b95dc5604d
commit 4daf644284
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/funkin/modding/base/ScriptedMusicBeatSubState.hx
View file

@ -1,16 +1,8 @@
package funkin.modding.base;
/**
<<<<<<< HEAD
* A script that can be tied to a MusicBeatSubstate.
* Create a scripted class that extends MusicBeatSubstate to use this.
*/
@:hscriptClass
class ScriptedMusicBeatSubstate extends funkin.MusicBeatSubstate implements HScriptedClass {}
=======
* A script that can be tied to a MusicBeatSubState.
* Create a scripted class that extends MusicBeatSubState to use this.
*/
@:hscriptClass
class ScriptedMusicBeatSubState extends funkin.MusicBeatSubState implements HScriptedClass {}
>>>>>>> f73c34bcbea4289202f6ef90522808b211d1cf44