Fixes #2120 (ammended)

borgbase · Nov 22, 2024 · 962b38d · 962b38d
1 parent fb6d726
commit 962b38d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/vorta/utils.py b/src/vorta/utils.py
@@ -76,11 +76,14 @@ def __init__(self, decorator_instance, wrapped_instance, *args, **kwargs):
 
         def run(self):
             self.decorator_instance(self.wrapped_instance, *self.args, **self.kwargs)
+<<<<<<< HEAD
 <<<<<<< HEAD
             self.terminate()
             self.wait()
 =======
 >>>>>>> 9eca72e (Fixes #2120 (ammended))
+=======
+>>>>>>> 4ea5b32 (Fixes #2120 (ammended))
 
 
 class FilePathInfoAsync(QThread):