merge conflict

Signed-off-by: RichardHoch <[email protected]>

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, `[email protected]`.