From f634a099c36613c98cf57032b1e943ace4dc5695 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sat, 22 Jul 2023 14:43:28 -0400
Subject: [PATCH] actual songdata git merge proper lol

---
 source/funkin/play/song/SongData.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/funkin/play/song/SongData.hx b/source/funkin/play/song/SongData.hx
index 4ec90d3ec..b0ab4ccf1 100644
--- a/source/funkin/play/song/SongData.hx
+++ b/source/funkin/play/song/SongData.hx
@@ -895,12 +895,12 @@ abstract SongTimeChange(RawSongTimeChange) from RawSongTimeChange
 
   public var beatTime(get, set):Null<Float>;
 
-  function get_beatTime():Int
+  public function get_beatTime():Null<Float>
   {
     return this.b;
   }
 
-  function set_beatTime(value:Int):Int
+  public function set_beatTime(value:Null<Float>):Null<Float>
   {
     return this.b = value;
   }