Fix merge

2021-01-08 02:15:13 +01:00 · 2021-01-08 02:15:13 +01:00 · affc1bae59
parent 451dd9cba7
commit affc1bae59
4 changed files with 0 additions and 15 deletions
--- 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
--- 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"
--- 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"
--- 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"