From a45432ef665bbe645ad8673c18c334be45a6f86f Mon Sep 17 00:00:00 2001
From: maverickdgg <danielcyc38@gmail.com>
Date: Tue, 1 Nov 2022 15:35:50 +0800
Subject: [PATCH] Merge conflict

---
 SHADE_Managed/src/Engine/Time.cxx | 1 +
 SHADE_Managed/src/Engine/Time.hxx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/SHADE_Managed/src/Engine/Time.cxx b/SHADE_Managed/src/Engine/Time.cxx
index e244f3c5..36032e00 100644
--- a/SHADE_Managed/src/Engine/Time.cxx
+++ b/SHADE_Managed/src/Engine/Time.cxx
@@ -34,6 +34,7 @@ namespace SHADE
     float Time::DeltaTimeF::get()
     {
       return static_cast<float>(SHFrameRateController::GetRawDeltaTime());
+    }
     double Time::FixedDeltaTime::get()
     {
         return SHPhysicsSystemInterface::GetFixedDT();
diff --git a/SHADE_Managed/src/Engine/Time.hxx b/SHADE_Managed/src/Engine/Time.hxx
index d97b74df..c0f0ed62 100644
--- a/SHADE_Managed/src/Engine/Time.hxx
+++ b/SHADE_Managed/src/Engine/Time.hxx
@@ -41,6 +41,7 @@ namespace SHADE
         static property float DeltaTimeF
         {
           float get();
+        }
         /// <summary>
         /// Time taken for Physics simulations. You should use this for operations 
         /// within Script.FixedUpdate()