Merge remote-tracking branch 'origin/master' into client

adamtheturtle · adamtheturtle · commit 2f059946ff08 · 2018-10-12T00:06:26.000+01:00
diff --git a/src/vws/exceptions.py b/src/vws/exceptions.py
@@ -253,6 +253,7 @@ def response(self) -> Response:
         The response returned by Vuforia which included this error.
         """
         return self._response
+<<<<<<< HEAD
 
 
 class InactiveProject(Exception):
