From 7def97ea7894a5b27e95969499210ec950d3c925 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Mon, 7 Sep 2015 10:18:35 -0400
Subject: Update main.cpp

---
 src/main.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 8d2d537..4d67d0a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #include <iostream>
 #include "SDL.h"
 #include "SDL_opengl.h"
@@ -18,9 +17,6 @@ bool gameRunning = true;
     const float sh = SCREEN_HEIGHT;
     const float sw = SCREEN_WIDTH;
 
-#include "gameHeader.h"
-
-
 int main(int argc, char** argv){
     //runs startup procedures
     if(SDL_Init(SDL_INIT_VIDEO) < 0){
@@ -55,8 +51,6 @@ int main(int argc, char** argv){
                     //update window
                     SDL_UpdateWindowSurface(window);
 
-                    configRender();
-                    gameLoop();
                 }
             }
 
@@ -68,12 +62,4 @@ int main(int argc, char** argv){
     SDL_DestroyWindow(window);
     SDL_Quit();
     return 0;
-=======
-#include <stdio.h>
-#include <SDL2/SDL.h>
-
-int main(int argc,char **argv){
-	puts("Hello, world!");
-	return 0;
->>>>>>> origin/master
 }
-- 
cgit v1.2.3