From affc1bae59858a0567e19a1ba0c5e245fef57b01 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 8 Jan 2021 02:15:13 +0100
Subject: [PATCH] Fix merge

---
 squirrelbattle/entities/player.py                      | 3 ---
 squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po | 4 ----
 squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po | 4 ----
 squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po | 4 ----
 4 files changed, 15 deletions(-)

diff --git a/squirrelbattle/entities/player.py b/squirrelbattle/entities/player.py
index 8d7898c..615dfd5 100644
--- a/squirrelbattle/entities/player.py
+++ b/squirrelbattle/entities/player.py
@@ -2,10 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from random import randint
-<<<<<<< squirrelbattle/entities/player.py
 from typing import Dict, Optional, Tuple
-=======
->>>>>>> squirrelbattle/entities/player.py
 
 from .items import Item
 from ..interfaces import FightingEntity, InventoryHolder
diff --git a/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po b/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
index 9c5dbc4..20aa2a7 100644
--- a/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
+++ b/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
@@ -247,10 +247,6 @@ msgstr "Textur-Packung"
 msgid "Language"
 msgstr "Sprache"
 
-#: squirrelbattle/tests/translations_test.py:62
-msgid "player"
-msgstr "Spieler"
-
 #: squirrelbattle/tests/translations_test.py:64
 msgid "hedgehog"
 msgstr "Igel"
diff --git a/squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po b/squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
index 74f6a65..0bfdac6 100644
--- a/squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
+++ b/squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
@@ -246,10 +246,6 @@ msgstr "Paquete de texturas"
 msgid "Language"
 msgstr "Languaje"
 
-#: squirrelbattle/tests/translations_test.py:62
-msgid "player"
-msgstr "jugador"
-
 #: squirrelbattle/tests/translations_test.py:64
 msgid "hedgehog"
 msgstr "erizo"
diff --git a/squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po b/squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
index 5028b07..42172c3 100644
--- a/squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
+++ b/squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
@@ -247,10 +247,6 @@ msgstr "Pack de textures"
 msgid "Language"
 msgstr "Langue"
 
-#: squirrelbattle/tests/translations_test.py:62
-msgid "player"
-msgstr "joueur"
-
 #: squirrelbattle/tests/translations_test.py:64
 msgid "hedgehog"
 msgstr "hérisson"