fixed merge conflict

1 files changed, 0 insertions, 19 deletions

diff --git a/gameloop/src/main.cpp b/gameloop/src/main.cpp
deleted file mode 100644
index 2333e63..0000000
--- a/gameloop/src/main.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//Using SDL and standard IO
-#include <SDL2/SDL.h>
-#include <stdio.h>
-//#include "window.h"
-#include "loopManager.h"
-#include "timer.h"
-//Screen dimension constants
-
-
-//Starts up SDL and creates window
-
-int main( int argc, char* args[] )
-{
-	LoopManager gameLoop;
-	gameLoop.setup();
-	gameLoop.loop();
-
-	return 0;
-}