fixed merge conflict

1 files changed, 0 insertions, 30 deletions

diff --git a/gameloop/include/gameObject.h b/gameloop/include/gameObject.h
deleted file mode 100644
index fc7d026..0000000
--- a/gameloop/include/gameObject.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-#include <iostream>
-class GameObject {
-	public:
-		GameObject();
-		GameObject(std::string name, float x, float y, float width, float height, float velX, float velY);
-		std::string getName() const;
-		float getX() const;
-		float getY() const;
-		float getWidth() const;
-		float getHeight() const;
-		float getVelX() const;
-		float getVelY() const;
-		void setName(std::string value);
-		void setX(float value);
-		void setY(float value);
-		void setWidth(float value);
-		void setHeight(float value);
-		void setVelX(float value);
-		void setVelY(float value);
-		int direction;
-	private:
-		std::string name = "";
-		float x = 0;
-		float y = 0;
-		float width = 0;
-		float height = 0;
-		float velX = 0;
-		float velY = 0;
-};