diff --git a/hacktools/__init__.py b/hacktools/__init__.py index 777ce52..3586090 100644 --- a/hacktools/__init__.py +++ b/hacktools/__init__.py @@ -1 +1 @@ -__version__ = "0.35.2" +__version__ = "0.36.0" diff --git a/hacktools/common.py b/hacktools/common.py index 3c99254..9176954 100644 --- a/hacktools/common.py +++ b/hacktools/common.py @@ -1163,8 +1163,7 @@ def copyFolder(f1, f2): def mergeFolder(f1, f2): - import distutils.dir_util - distutils.dir_util.copy_tree(f1, f2, verbose=0) + shutil.copytree(f1, f2, dirs_exist_ok=True) def copyFile(f1, f2):