From 4fedb9e34ad4a2d84e9afeb3323d325e99c9bd3c Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Mon, 18 Apr 2022 19:51:18 -0400
Subject: [PATCH] derp XD

---
 source/funkin/play/PlayState.hx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index ce31dcbbe..998b9c46d 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -832,10 +832,7 @@ class PlayState extends MusicBeatState implements IHook
 				// swagNote.data = songNotes;
 				swagNote.data.sustainLength = songNotes.sustainLength;
 				swagNote.data.altNote = songNotes.altNote;
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/master
 				swagNote.scrollFactor.set(0, 0);
 
 				var susLength:Float = swagNote.data.sustainLength;