resolving merge conflicts
This commit is contained in:
@@ -15,8 +15,10 @@
|
||||
package config
|
||||
|
||||
const (
|
||||
ConfKey = "conf"
|
||||
ETCD = "etcd"
|
||||
MountConfigFilePath = "CONFIG_PATH"
|
||||
DeploymentType = "DEPLOYMENT_TYPE"
|
||||
KUBERNETES = "kubernetes"
|
||||
ETCD = "etcd"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
Reference in New Issue
Block a user