合并

services/knowoapi/services/rule_chain.go

@@ -76,10 +76,6 @@ func (a ruleChainService) Create(ruleChain *models.RuleChain) error {
 }
 
 func (a ruleChainService) create(params *models.RuleChainParams) (firstNodeId string, err error) {
-<<<<<<< HEAD
-=======
-
->>>>>>> 30a0e004edad0622e971d2f781dc46f5bf3f398c
 	nodeMap := make(map[string]models.RuleNode)
 	var inputNodeId string