1
0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00

Resolving conflict and removing commented code (#3387)

This commit is contained in:
ttalty 2023-10-31 11:06:02 -04:00 committed by GitHub
parent 1800e6ffd3
commit 419760623a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -46,6 +46,7 @@ public static class FeatureFlagKeys
public const string AutofillV2 = "autofill-v2"; public const string AutofillV2 = "autofill-v2";
public const string BrowserFilelessImport = "browser-fileless-import"; public const string BrowserFilelessImport = "browser-fileless-import";
public const string AutofillOverlay = "autofill-overlay"; public const string AutofillOverlay = "autofill-overlay";
public const string ItemShare = "item-share";
public static List<string> GetAllKeys() public static List<string> GetAllKeys()
{ {