Fixes #2120 (ammended)

Author: mycir

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):