diff --git a/docs/api/source.md b/docs/api/source.md index 6343e9ba..96e6e76d 100644 --- a/docs/api/source.md +++ b/docs/api/source.md @@ -377,22 +377,26 @@ consult the documentation for your version to find out what those are.

-<<<<<<< HEAD suspend
-======= -gitProtocolV2Compatibility
->>>>>>> 780d289 (Refactor to support v1 and v2 git clients) bool (Optional) -<<<<<<< HEAD

This flag tells the controller to suspend the reconciliation of this source.

-======= + + + + +gitProtocolV2Compatibility
+ +bool + + + +(Optional)

Enables support for git servers that require v2.

->>>>>>> 780d289 (Refactor to support v1 and v2 git clients) @@ -714,9 +718,9 @@ HelmRepositoryStatus

(Appears on: -BucketStatus, -GitRepositoryStatus, -HelmChartStatus, +BucketStatus, +GitRepositoryStatus, +HelmChartStatus, HelmRepositoryStatus)

Artifact represents the output of a source synchronisation.

@@ -1218,10 +1222,7 @@ consult the documentation for your version to find out what those are.

-<<<<<<< HEAD suspend
-======= -gitProtocolV2Compatibility
bool @@ -1229,6 +1230,17 @@ bool (Optional)

This flag tells the controller to suspend the reconciliation of this source.

+ + + + +gitProtocolV2Compatibility
+ +bool + + + +(Optional)

Enables support for git servers that require v2.