From 7eb3d7b8b0dd46d2cff19421c46abfab158472dd Mon Sep 17 00:00:00 2001
From: Shivam Durgbuns <sdurgbun@redhat.com>
Date: Thu, 30 May 2024 21:07:03 +0530
Subject: [PATCH] Resolving conflict

Signed-off-by: Shivam Durgbuns <sdurgbun@redhat.com>
---
 ocs_ci/ocs/exceptions.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ocs_ci/ocs/exceptions.py b/ocs_ci/ocs/exceptions.py
index 703f77fca4d..d9a4b5e72f8 100644
--- 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)