From a42ea40655b0ca1ae628b1453b0f5b4aacdd8f47 Mon Sep 17 00:00:00 2001 From: Sean Tan Date: Mon, 13 Sep 2021 13:34:52 -0700 Subject: [PATCH] Regenerate api-report Signed-off-by: Sean Tan --- plugins/catalog-backend/api-report.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md index c0beed6b45..30e1887825 100644 --- a/plugins/catalog-backend/api-report.md +++ b/plugins/catalog-backend/api-report.md @@ -151,7 +151,13 @@ export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor { ): Promise; } -<<<<<<< HEAD +// Warning: (ae-missing-release-tag) "AwsOrganizationProviderConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public +export type AwsOrganizationProviderConfig = { + roleArn?: string; +}; + // Warning: (ae-missing-release-tag) "AwsS3DiscoveryProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) @@ -165,14 +171,6 @@ export class AwsS3DiscoveryProcessor implements CatalogProcessor { parser: CatalogProcessorParser, ): Promise; } -======= -// Warning: (ae-missing-release-tag) "AwsOrganizationProviderConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public -export type AwsOrganizationProviderConfig = { - roleArn?: string; -}; ->>>>>>> 11da7e59e940bb91e61c3b0d2db6ec7d38ce0126 // Warning: (ae-missing-release-tag) "BitbucketDiscoveryProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) //