From e0b263d8203336b5b8750f2657e19af6307c986e Mon Sep 17 00:00:00 2001 From: RichardHoch Date: Tue, 26 Nov 2024 14:04:29 +0200 Subject: [PATCH] merge conflict Signed-off-by: RichardHoch --- documentation/modules/adding-source-provider.adoc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/documentation/modules/adding-source-provider.adoc b/documentation/modules/adding-source-provider.adoc index 382ca43682d..dd41ba8bda4 100644 --- a/documentation/modules/adding-source-provider.adoc +++ b/documentation/modules/adding-source-provider.adoc @@ -88,10 +88,8 @@ ifdef::vmware[] * *URL*: URL of the SDK endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the `sdk` path, usually `/sdk`. For example, `https://vCenter-host-example.com/sdk`. If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate. * *VDDK init image*: `VDDKInitImage` path. It is strongly recommended to create a VDDK init image to accelerate migrations. For more information, see xref:../master.adoc#creating-vddk-image_mtv[Creating a VDDK image]. -<<<<<<< HEAD + + -======= ->>>>>>> 0e58345e (resolved conflict) *Provider credentials* * *Username*: vCenter user or ESXi user. For example, `user@vsphere.local`.