From 230a7ec432791d496250e93bfcf98ceaa8992169 Mon Sep 17 00:00:00 2001
From: eichhornchen <eichhornchen@aspiredeb>
Date: Fri, 23 Oct 2020 15:55:30 +0200
Subject: [PATCH] Cleaned an error in interfaces.py

---
 dungeonbattle/interfaces.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dungeonbattle/interfaces.py b/dungeonbattle/interfaces.py
index 12cdaf7..934f290 100644
--- 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:
         """