Merge conflict

2023-08-07 19:04:01 -04:00
parent a5ee88cb8e
commit 10cf82ee06
2 changed files with 10 additions and 4 deletions
--- a/Editor/Runtime.cpp
+++ b/Editor/Runtime.cpp
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <string>

+/*
 void CheckError()
 {
    GLenum err;
@@ -38,4 +39,4 @@ void main(int argc, char* argv[])
        
        Nuake::Engine::EndDraw();
    }
-}
+}*/