Fix merge

2021-01-08 02:15:13 +01:00
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