merge error fixed

This commit is contained in:
pseusys
2023-02-28 23:04:22 +01:00
parent 972610a1cd
commit c4880d8c4f

View File

@@ -30,7 +30,7 @@ class FileManager:
:param file: Localization file path, related to current file (in sources root). :param file: Localization file path, related to current file (in sources root).
""" """
with open(join(dirname(__file__), file), encoding="utf-8") as config_file: with open(join(dirname(__file__), file), encoding="utf-8") as config_file:
data = load(config_file) data = load_json(config_file)
FileManager._LOCALIZATION = data[EM.LOCALE] FileManager._LOCALIZATION = data[EM.LOCALE]
@staticmethod @staticmethod