mirror of
https://github.com/bitwarden/server.git
synced 2024-12-01 13:43:23 +01:00
resolve conflict
Signed-off-by: Cy Okeke <cokeke@bitwarden.com>
This commit is contained in:
parent
d5f2eeee1c
commit
be832de470
@ -148,6 +148,7 @@ public static class FeatureFlagKeys
|
||||
public const string LimitCollectionCreationDeletionSplit = "pm-10863-limit-collection-creation-deletion-split";
|
||||
public const string GeneratorToolsModernization = "generator-tools-modernization";
|
||||
public const string NewDeviceVerification = "new-device-verification";
|
||||
public const string RiskInsightsCriticalApplication = "pm-14466-risk-insights-critical-application";
|
||||
public const string DisableFreeFamiliesSponsorship = "PM-12274-disable-free-families-sponsorship";
|
||||
|
||||
public static List<string> GetAllKeys()
|
||||
|
Loading…
Reference in New Issue
Block a user