resolve merge conflict

RichardHoch · RichardHoch · commit 2634f2a12473 · 2023-02-01T12:48:49.000+02:00
diff --git a/modules/oadp-enabling-csi-dpa.adoc b/modules/oadp-enabling-csi-dpa.adoc
@@ -31,8 +31,5 @@ spec:
       defaultPlugins:
       - openshift
       - csi <1>
-    featureFlags:
-    - EnableCSI <2>
 ----
 <1> Add the `csi` default plugin.
-<2> Add the `EnableCSI` feature flag.
