From 6e8ebf781ac457b7ec77f7e4c9ade4c3d36002bc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:42:05 +0800
Subject: [PATCH] merge master
---
labelFilter/ruleForLabel.go | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 74a3f98..bb4f9a5 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -6,18 +6,11 @@
"basic.com/valib/logger.git"
"github.com/golang/protobuf/proto"
"github.com/knetic/govaluate"
-<<<<<<< HEAD
- "ruleprocess/logger"
-=======
->>>>>>> master
"ruleprocess/structure"
"strconv"
"time"
)
-<<<<<<< HEAD
-func Judge(msg structure.ResultMsg) {
-=======
func PushSomthing(msg structure.ResultMsg) {
defer func() {
if err := recover(); err != nil {
@@ -25,7 +18,6 @@
}
}()
start := time.Now()
->>>>>>> master
// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
label := new(Label)
label.DataFormatToLabel(msg)
--
Gitblit v1.8.0