mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-17 08:35:52 +00:00
Fix merge conflicts
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
export enum IdentityAuthMethod {
|
||||
UNIVERSAL_AUTH = "universal-auth",
|
||||
GCP_IAM_AUTH = "gcp-iam-auth"
|
||||
GCP_IAM_AUTH = "gcp-iam-auth",
|
||||
AWS_IAM_AUTH = "aws-iam-auth"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user