WIF

commit

Author: mletalie

osd_planning/gcp-ccs.adoc

@@ -23,6 +23,7 @@ include::modules/osd-gcp-psc-firewall-prerequisites.adoc[leveloffset=+1]
 == Additional resources
 
 *  xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]
+<<<<<<< HEAD
 
 * For more information about creating an {product-title} cluster with the Workload Identity Federation (WIF) authentication type, see xref:../osd_gcp_clusters/creating-a-gcp-cluster-with-workload-identity-federation.adoc#osd-creating-a-cluster-on-gcp-with-workload-identity-federation[Creating a cluster on GCP with Workload Identity Federation authentication].