resolved conflicts

Author: Jojain

cadquery/cq.py

@@ -51,7 +51,7 @@
 
 from .occ_impl.exporters.svg import getSVG, exportSVG
 
-from .utils import deprecate_kwarg, deprecate, deprecate_kwarg_name
+from .utils import deprecate, deprecate_kwarg_name
 
 from .selectors import (
     Selector,

cadquery/utils.py

@@ -25,18 +25,6 @@ def wrapped(*args, **kwargs):
 
         return wrapped
 
-
-class deprecate:
-    def __call__(self, f):
-        @wraps(f)
-        def wrapped(*args, **kwargs):
-
-            warn(f"{f.__name__} will be removed in the next release.", FutureWarning)
-
-            return f(*args, **kwargs)
-
-        return wrapped
-
 class deprecate_kwarg_name:
     def __init__(self, name, new_name):
 
@@ -57,4 +45,16 @@ def wrapped(*args, **kwargs):
 
             return f(*args, **kwargs)
 
-        return wrapped
+        return wrapped
+        
+class deprecate:
+    def __call__(self, f):
+        @wraps(f)
+        def wrapped(*args, **kwargs):
+
+            warn(f"{f.__name__} will be removed in the next release.", FutureWarning)
+
+            return f(*args, **kwargs)
+
+        return wrapped
+