From 962b38d01740513f281621f2ac741e886b1f72d4 Mon Sep 17 00:00:00 2001
From: mycir <113249299+mycir@users.noreply.github.com>
Date: Fri, 22 Nov 2024 10:40:49 +0000
Subject: [PATCH] Fixes #2120 (ammended)

---
 src/vorta/utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vorta/utils.py b/src/vorta/utils.py
index bf3d6044a..6d114b74e 100644
--- 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):