Merge branch 'release-1.5' into RHIDP-5570

Author: Gerry-Forde

modules/dynamic-plugins/con-dynamic-plugins-cache.adoc

@@ -13,11 +13,7 @@ When you enable dynamic plugins cache:
 == Enabling the dynamic plugins cache
 To enable the dynamic plugins cache in {product-very-short}, the plugins directory `dynamic-plugins-root` must be a persistent volume. 
 
-// For Helm chart installations, a persistent volume named `dynamic-plugins-root` is automatically created.
-
 === Creating a PVC for Dynamic Plugins Cache using the Operator
-// For operator-based installations, you must manually create the PersistentVolumeClaim (PVC) as follows:
-
 For operator-based installations, you must manually create the PersistentVolumeClaim (PVC) by replacing the default `dynamic-plugins-root` volume with a Persistent Volume Claim (PVC) named `dynamic-plugins-root`. 
 
 Create the persistent volume definition and save it to a file, for example `pvc.yaml`.
@@ -39,14 +35,10 @@ spec:
 
 Replace the default dynamic-plugins-root volume with a persistent volume claim (PVC) named dynamic-plugins-root. 
 
-<<<<<<< HEAD
-apiVersion: rhdh.redhat.com/v1alpha3
-=======
 .Example replacing the `dynamic-plugins-root` volume 
 [source,yaml]
 ----
-apiVersion: rhdh.redhat.com/v1alpha2
->>>>>>> 5ef6a4fa9 (RHIDP-5570 - Document that the Dynamic Plugin cache PVC is disabled by default)
+apiVersion: rhdh.redhat.com/v1alpha3
 kind: Backstage
 metadata:
   name: developer-hub