Fixed Conflict

Author: PinkChicken

Map_Gen/ParseMap.py

@@ -12,15 +12,12 @@ def access_information(self, x, y, item):
             return _biome.name
         elif item == "Crossable":
             return _biome.crossable
-<<<<<<< HEAD
         elif item == "Resources":
             return _biome.resources
         elif item == "Spawns":
             return _biome.spawns
         elif item == "Info":
             return _biome.info
-=======
->>>>>>> master
 
     def parse(self):
         __map = list(self.map.read().split())