From 3e6076b724b1251a3911599936ddb8758b099ccb Mon Sep 17 00:00:00 2001
From: Tamir Atias <engine.games@gmail.com>
Date: Sun, 15 Jan 2012 17:07:51 +0200
Subject: [PATCH] [Fix] Removed git tags <__<

---
 src/Unuk/Game.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Unuk/Game.cpp b/src/Unuk/Game.cpp
index 12aaf17..d5d2526 100644
--- a/src/Unuk/Game.cpp
+++ b/src/Unuk/Game.cpp
@@ -37,13 +37,8 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
   _gameRenderTime.SetXY(10, 50);
   _gameRenderTime.SetTextBlended("Render - XX", vsmall, COLOUR_BLACK);
 
-<<<<<<< HEAD
   _gameUpdateTime.SetXY(10, 70);
   _gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK);
-=======
-  _gameUpdateTime.SetXY(10, 30);
-	_gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK);
->>>>>>> 5269706e05ea3558838a6eaa330cd8cc53b3cd58
 
   stringstream playerXYString;
   _playerXY.SetXY(10, 90);