Remove git markers

adamtheturtle · adamtheturtle · commit 513ae372b523 · 2018-11-23T20:49:58.000Z
diff --git a/src/vws/exceptions.py b/src/vws/exceptions.py
@@ -253,7 +253,6 @@ def response(self) -> Response:
         The response returned by Vuforia which included this error.
         """
         return self._response
-<<<<<<< HEAD
 
 
 class InactiveProject(Exception):
