Cleaned an error in interfaces.py

2020-10-23 15:55:30 +02:00 · 2020-10-23 15:55:30 +02:00 · 230a7ec432
parent 6c675fbac9
commit 230a7ec432
1 changed files with 2 additions and 4 deletions
--- a/dungeonbattle/interfaces.py
+++ b/dungeonbattle/interfaces.py
@ -37,11 +37,9 @@ class Map:
        width = len(lines[0])
        tiles = [[Tile(c)
                  for x, c in enumerate(line)] for y, line in enumerate(lines)]
-<<<<<<< HEAD
-        return Map(width, height, tiles)
-=======
+
        return Map(width, height, tiles, [])
->>>>>>> master
+

    def draw_string(self) -> str:
        """