1 files changed, 1 insertions, 30 deletions
diff --git a/include/entities.h b/include/entities.h
index 89d9ec3..5f0c9ee 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -1,10 +1,8 @@
-<<<<<<< HEAD
 #ifndef ENTITIES_H
 #define ENTITIES_H
 
 #include <common.h>
 
-
 class Entities{
 public:
 	float width;
@@ -27,31 +25,4 @@ public:
 	~Player();
 };
 
-=======
-#ifndef ENTITIES_H
-#define ENTITIES_H
-
-#include <common.h>
-
-
-class Entities{
-public:
-	float width;
-	float height;
-	float speed;
-	int type;
-	vec2 loc;
-
-	void spawn(float, float);
-
-
-};
-
-class Player : public Entities{
-public:
-	Player();
-	~Player();
-};
-
->>>>>>> origin/master
-#endif //ENTITIES_H
-\ No newline at end of file
+#endif // ENTITIES_H