diff --git a/tools/mapmerge/map_helpers.py b/tools/mapmerge/map_helpers.py index abea39e1d2e..5c399a12e5e 100644 --- a/tools/mapmerge/map_helpers.py +++ b/tools/mapmerge/map_helpers.py @@ -1,4 +1,3 @@ -import collections import sys try: @@ -10,6 +9,8 @@ except: print("ERROR: Something went wrong, you might be running an incompatible version of Python. The current minimum version required is [3.5].\nYour version: {}".format(sys.version)) sys.exit() +import collections + error = {0:"OK", 1:"WARNING: Key lengths are different, all the lines change."} maxx = 0 diff --git a/tools/mapmerge/mapmerger.py b/tools/mapmerge/mapmerger.py index 47043b2c8fa..b93684bbc9e 100644 --- a/tools/mapmerge/mapmerger.py +++ b/tools/mapmerge/mapmerger.py @@ -1,7 +1,7 @@ +import map_helpers import sys import os import pathlib -import map_helpers import shutil #main("../../_maps/")