Fixed merge conflicts with next-gen

This commit is contained in:
2022-11-08 08:35:01 -06:00
22 changed files with 38 additions and 166 deletions

View File

@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
""" Module to perform session actions such as addition, removal or display of the global settings dialogue. """
import shutil
import time
import os
import logging