Fix merge issues

This commit is contained in:
Yohann D'ANELLO
2021-01-10 22:19:15 +01:00
parent 4c7a2e9f3b
commit 0ea10546ac
4 changed files with 8 additions and 8 deletions

View File

@ -1,13 +1,13 @@
# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
# SPDX-License-Identifier: GPL-3.0-or-later
import unittest
from random import randint
from typing import List
import unittest
from squirrelbattle.interfaces import Map, Tile
from squirrelbattle.mapgeneration import broguelike
from squirrelbattle.display.texturepack import TexturePack
from ..display.texturepack import TexturePack
from ..interfaces import Map, Tile
from ..mapgeneration import broguelike
class TestBroguelike(unittest.TestCase):