resolving merge conflicts

This commit is contained in:
withchao
2025-02-25 18:16:57 +08:00
parent 0006bce0a2
commit 57710bb9e3
5 changed files with 39 additions and 5 deletions
+4 -2
View File
@@ -15,8 +15,10 @@
package config
const (
ConfKey = "conf"
ETCD = "etcd"
MountConfigFilePath = "CONFIG_PATH"
DeploymentType = "DEPLOYMENT_TYPE"
KUBERNETES = "kubernetes"
ETCD = "etcd"
)
const (