1 files changed, 1 insertions, 19 deletions
diff --git a/src/entities.cpp b/src/entities.cpp
index 1b8861a..8d582a1 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #include <entities.h>
 
 void Entities::spawn(float x, float y){
@@ -19,21 +18,4 @@ Player::Player(){
 	type = 0;
 }
 
-=======
-#include <entities.h>
-
-void Entities::spawn(float x, float y){
-	loc.x = x;
-	loc.y = y;
-
-}
-
-Player::Player(){
-	width = 24;
-	height = 42;
-	speed = 1;
-	type = 0;
-}
-
->>>>>>> origin/master
-Player::~Player(){}
-\ No newline at end of file
+Player::~Player(){}