Solved conflicts

Author: iorek

Motor2D/GameScene.cpp

@@ -65,6 +65,7 @@ bool GameScene::Start()
 	main_cur = App->ui->CreateCursor(sections, 0.08);
 
 
+
 	return true;
 }
 

Motor2D/Unit.cpp

@@ -129,9 +129,11 @@ iPoint Unit::GetDirection()const
 	iPoint ret(round(direction.x), round(direction.y));
 
 	return ret;
+
 }
 
 UNIT_TYPE Unit::GetType()const
 {
 	return type;
+
 }

Motor2D/Unit.h

@@ -42,8 +42,10 @@ class Unit : public Entity
 	void SetPath(vector<iPoint> _path);
 
 	iPoint GetDirection()const; //Returns the direction in form of a vector. Ex: (1,1) -north-east (-1) south etc
+
 	UNIT_TYPE GetType()const;
 
+
 private:
 
 	void Move(float dt);