From 4daf6442846b58603f1cd13fda7a56af776be4d5 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 9 Jun 2023 16:03:45 -0400
Subject: [PATCH] ree

---
 source/funkin/modding/base/ScriptedMusicBeatSubState.hx | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/source/funkin/modding/base/ScriptedMusicBeatSubState.hx b/source/funkin/modding/base/ScriptedMusicBeatSubState.hx
index 5090bf2b4..7dab3d7dd 100644
--- a/source/funkin/modding/base/ScriptedMusicBeatSubState.hx
+++ b/source/funkin/modding/base/ScriptedMusicBeatSubState.hx
@@ -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