From 39d7471dc8bd2bf437400ccbccd969d7b4ffd28e Mon Sep 17 00:00:00 2001 From: "matthias@arch" Date: Fri, 15 Dec 2023 23:59:43 +0100 Subject: [PATCH] move line to avoid merge conflicts --- imgsort/sorter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imgsort/sorter.py b/imgsort/sorter.py index 9112ce8..5268043 100755 --- a/imgsort/sorter.py +++ b/imgsort/sorter.py @@ -13,8 +13,9 @@ if __name__ == "__main__": # make relative imports work as described here: http filepath = path.realpath(path.abspath(__file__)) sys.path.insert(0, path.dirname(path.dirname(filepath))) -from .configs import ConfigManager from .ueberzug import UeberzugLayer + +from .configs import ConfigManager from .globals import version, settings_map from .globals import warning, error, user_error, info, create_dir