fix code

Signed-off-by: oviner <[email protected]>
red-hat-storage · May 30, 2024 · e26902c · e26902c
1 parent 71713e8
commit e26902c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/ocs_ci/helpers/helpers.py b/ocs_ci/helpers/helpers.py
@@ -4727,6 +4727,7 @@ def flatten_multilevel_dict(d):
     return leaves_list
 
 
+<<<<<<< HEAD
 def is_rbd_default_storage_class(custom_sc=None):
     """
     Check if RDB is a default storageclass for the cluster

diff --git a/ocs_ci/ocs/constants.py b/ocs_ci/ocs/constants.py
@@ -31,11 +31,8 @@
 TEMPLATE_DEPLOYMENT_DIR_LVMO = os.path.join(TEMPLATE_DIR, "lvmo-deployment")
 TEMPLATE_MULTICLUSTER_DIR = os.path.join(TEMPLATE_DEPLOYMENT_DIR, "multicluster")
 TEMPLATE_DEPLOYMENT_DIR_CNV = os.path.join(TEMPLATE_DIR, "cnv-deployment")
-<<<<<<< HEAD
 TEMPLATE_DEPLOYMENT_DIR_METALLB = os.path.join(TEMPLATE_DIR, "metallb-deployment")
-=======
 TEMPLATE_DEPLOYMENT_DIR_NMSTATE = os.path.join(TEMPLATE_DIR, "nmstate-deployment")
->>>>>>> 07fb050fc (Added NMState deployment)
 TEMPLATE_CEPH_DIR = os.path.join(TEMPLATE_DIR, "ceph")
 TEMPLATE_CSI_DIR = os.path.join(TEMPLATE_DIR, "CSI")
 TEMPLATE_CSI_LVM_DIR = os.path.join(TEMPLATE_CSI_DIR, "lvm")
@@ -862,7 +859,6 @@
     TEMPLATE_CNV_VM_STANDALONE_PVC_DIR, "vm.yaml"
 )
 
-<<<<<<< HEAD
 METALLB = "metallb-operator"
 METALLB_CONTROLLER_MANAGER_PREFIX = "metallb-operator-controller-manager"
 METALLB_WEBHOOK_PREFIX = "metallb-operator-webhook-server"