Fix merge issues
This commit is contained in:
@ -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):
|
||||
|
Reference in New Issue
Block a user