From acea273f972087e5410c42d2d08f5192c788022f Mon Sep 17 00:00:00 2001 From: Justin Baur <19896123+justindbaur@users.noreply.github.com> Date: Fri, 26 Apr 2024 09:39:46 -0400 Subject: [PATCH] Fix ConfigService Merge Conflict (#8932) --- .../providers/clients/manage-client-organizations.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-organizations.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-organizations.component.ts index 3cc96c4589..c10fdf0bc7 100644 --- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-organizations.component.ts +++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-organizations.component.ts @@ -38,7 +38,6 @@ export class ManageClientOrganizationsComponent extends BaseClientsComponent { private consolidatedBillingEnabled$ = this.configService.getFeatureFlag$( FeatureFlag.EnableConsolidatedBilling, - false, ); protected plans: PlanResponse[];