resolve conflict with base branch
This commit is contained in:
@@ -22,11 +22,11 @@ const (
|
||||
// EnvKeyDatabaseURL key for env variable DATABASE_URL
|
||||
EnvKeyDatabaseURL = "DATABASE_URL"
|
||||
// EnvAwsRegion key for env variable AWS REGION
|
||||
EnvAwsRegion = "REGION"
|
||||
// EnvAwsAccessKey key for env variable AWS_ACCESS_KEY
|
||||
EnvAwsAccessKey = "AWS_ACCESS_KEY"
|
||||
// EnvAwsAccessKey key for env variable AWS_SECRET_KEY
|
||||
EnvAwsSecretKey = "AWS_SECRET_KEY"
|
||||
EnvAwsRegion = "AWS_REGION"
|
||||
// EnvAwsAccessKeyID key for env variable AWS_ACCESS_KEY_ID
|
||||
EnvAwsAccessKeyID = "AWS_ACCESS_KEY_ID"
|
||||
// EnvAwsAccessKey key for env variable AWS_SECRET_ACCESS_KEY
|
||||
EnvAwsSecretAccessKey = "AWS_SECRET_ACCESS_KEY"
|
||||
// EnvAwsAccessKey key for env variable AWS_SECRET_KEY
|
||||
EnvCouchbaseScope = "COUCHBASE_SCOPE"
|
||||
// EnvAwsAccessKey key for env variable AWS_SECRET_KEY
|
||||
@@ -55,6 +55,8 @@ const (
|
||||
EnvKeySmtpUsername = "SMTP_USERNAME"
|
||||
// EnvKeySmtpPassword key for env variable SMTP_PASSWORD
|
||||
EnvKeySmtpPassword = "SMTP_PASSWORD"
|
||||
// EnvKeySmtpLocalName key for env variable SMTP_LOCAL_NAME
|
||||
EnvKeySmtpLocalName = "SMTP_LOCAL_NAME"
|
||||
// EnvKeySenderEmail key for env variable SENDER_EMAIL
|
||||
EnvKeySenderEmail = "SENDER_EMAIL"
|
||||
// EnvKeyIsEmailServiceEnabled key for env variable IS_EMAIL_SERVICE_ENABLED
|
||||
|
Reference in New Issue
Block a user