From 208482b0ce0982ff85ac92f0973d76b2660ccc91 Mon Sep 17 00:00:00 2001
From: Erik Persson <erikpersson583@gmail.com>
Date: Wed, 15 Jan 2014 11:25:59 +0100
Subject: [PATCH] GL merge error

---
 Code/Game/GameLogic/Game.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Code/Game/GameLogic/Game.cpp b/Code/Game/GameLogic/Game.cpp
index 0c70ad3b..20d13b18 100644
--- a/Code/Game/GameLogic/Game.cpp
+++ b/Code/Game/GameLogic/Game.cpp
@@ -55,13 +55,11 @@ void Game::GetAllPlayerPos()
 
 Game::PlayerData Game::CreatePlayer()
 {
-<<<<<<< HEAD
-	SmartPointer<Player> newPlayer = new Player();
+	SmartPointer<PlayerData> newPlayer = new PlayerData();
 
 	myData->players.Push(newPlayer);
-=======
-	return PlayerData();
->>>>>>> eb6ed13cceff0ce4380699391759883acf487107
+
+	return newPlayer;
 }
 
 void Game::CreateTeam()