From b8a14c948a5f6764f9f5679f70b5c266ba9b2aa3 Mon Sep 17 00:00:00 2001 From: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com> Date: Thu, 6 Nov 2025 11:15:21 -0500 Subject: [PATCH] fixing merge conflicts --- src/Core/Billing/Organizations/Models/OrganizationLicense.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Core/Billing/Organizations/Models/OrganizationLicense.cs b/src/Core/Billing/Organizations/Models/OrganizationLicense.cs index 6d99ff3a9b..4c2bb03b6e 100644 --- a/src/Core/Billing/Organizations/Models/OrganizationLicense.cs +++ b/src/Core/Billing/Organizations/Models/OrganizationLicense.cs @@ -426,7 +426,7 @@ public class OrganizationLicense : ILicense var useAdminSponsoredFamilies = claimsPrincipal.GetValue(nameof(UseAdminSponsoredFamilies)); var useOrganizationDomains = claimsPrincipal.GetValue(nameof(UseOrganizationDomains)); var useAutomaticUserConfirmation = claimsPrincipal.GetValue(nameof(UseAutomaticUserConfirmation)); - var useDisableSmAdsForUsers = claimsPrincipal.GetValue(OrganizationLicenseConstants.UseDisableSmAdsForUsers); + var useDisableSmAdsForUsers = claimsPrincipal.GetValue(nameof(UseDisableSmAdsForUsers)); return issued <= DateTime.UtcNow && expires >= DateTime.UtcNow && @@ -458,7 +458,7 @@ public class OrganizationLicense : ILicense useAdminSponsoredFamilies == organization.UseAdminSponsoredFamilies && useOrganizationDomains == organization.UseOrganizationDomains && useAutomaticUserConfirmation == organization.UseAutomaticUserConfirmation && - useDisableSMAdsForUsers == organization.UseDisableSmAdsForUsers; + useDisableSmAdsForUsers == organization.UseDisableSmAdsForUsers; }