Fix merge issues

2021-01-10 22:19:15 +01:00
parent 4c7a2e9f3b
commit 0ea10546ac
4 changed files with 8 additions and 8 deletions
--- a/squirrelbattle/mapgeneration/broguelike.py
+++ b/squirrelbattle/mapgeneration/broguelike.py
@ -1,10 +1,10 @@
 # Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
 # SPDX-License-Identifier: GPL-3.0-or-later

-from random import random, randint, shuffle, choice, choices
+from random import choice, choices, randint, random, shuffle
 from typing import List, Tuple

-from ..interfaces import Map, Tile, Entity
+from ..interfaces import Entity, Map, Tile

 DEFAULT_PARAMS = {
    "width": 120,