From b854d2862fbffaf9f11d67ddf0ca4f88967c65f8 Mon Sep 17 00:00:00 2001
From: jiangyong <jiangyong@batiao8.com>
Date: Wed, 30 Jul 2025 17:21:57 +0800
Subject: [PATCH] del merge

---
 config/form.go | 20 --------------------
 1 file changed, 20 deletions(-)

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
-}