diff --git a/config/form.go b/config/form.go index 5d0f120..82f328a 100644 --- a/config/form.go +++ b/config/form.go @@ -48,23 +48,3 @@ func NewFroms(tplConfig, saveConfig string) ([]*Form, error) { } return forms, err } - -func MergeConfig(oldConfig, newConfig string) (string, error) { - var oldCfg map[string]interface{} - var newCfg map[string]interface{} - json.Unmarshal([]byte(oldConfig), &oldCfg) - json.Unmarshal([]byte(newConfig), &newCfg) - if oldCfg == nil { - oldCfg = make(map[string]interface{}) - } - if newCfg == nil { - newCfg = make(map[string]interface{}) - } - - for k, v := range newCfg { - oldCfg[k] = v - } - - res, _ := json.Marshal(oldCfg) - return string(res), nil -}