Resolving conflict

Signed-off-by: Shivam Durgbuns <sdurgbun@redhat.com>
red-hat-storage · Jun 5, 2024 · 7eb3d7b · 7eb3d7b
1 parent 666beb9
commit 7eb3d7b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/ocs_ci/ocs/exceptions.py b/ocs_ci/ocs/exceptions.py
@@ -706,10 +706,7 @@ class ClusterNotInSTSModeException(Exception):
 
 class APIRequestError(Exception):
     pass
-<<<<<<< HEAD
 
 
 class ProviderModeNotFoundException(Exception):
     pass
-=======
->>>>>>> c4241be1 (Removing exceptions and adding assertions)