Progress

Author: adamtheturtle

src/vws/exceptions.py

@@ -248,7 +248,6 @@ def __init__(self, response: Response) -> None:
         self.response = response
 
 
-<<<<<<< HEAD
 class InactiveProject(Exception):
     """
     Exception raised when Vuforia returns a response with a result code
@@ -264,21 +263,6 @@ def __init__(self, response: Response) -> None:
         self.response = response
 
 
-class TargetStatusNotSuccess(Exception):
-    """
-    Exception raised when Vuforia returns a response with a result code
-    'TargetStatusNotSuccess'.
-    """
-
-    def __init__(self, response: Response) -> None:
-        """
-        Args:
-            response: The response to a request to Vuforia.
-        """
-        super().__init__()
-        self.response = response
-
-
 class DateRangeError(Exception):
     """
     Exception raised when Vuforia returns a response with a result code