合并后提交

.gitignore

@@ -12,8 +12,7 @@ cmd.exe~
 /go.mod
 /conf
 /logs
-<<<<<<< HEAD
+
 /mylogs
 /doc/test
-=======
->>>>>>> e30e7e5cf1e4c03c945073b5e6d46fabceff385a
+

go.mod

@@ -48,33 +48,28 @@ require (
 	github.com/tidwall/gjson v1.6.1
 	github.com/tidwall/sjson v1.1.1
 	github.com/uniplaces/carbon v0.1.6 // indirect
-<<<<<<< HEAD
+
 	go.etcd.io/bbolt v1.3.4 // indirect
-=======
->>>>>>> e30e7e5cf1e4c03c945073b5e6d46fabceff385a
+
 	go.mongodb.org/mongo-driver v1.3.5 // indirect
 	go.starlark.net v0.0.0-20201204201740-42d4f566359b // indirect
 	go.uber.org/zap v1.14.1 // indirect
-<<<<<<< HEAD
+
 	golang.org/x/arch v0.0.0-20201207015849-377592649dd6 // indirect
 	golang.org/x/sys v0.0.0-20201204225414-ed752295db88 // indirect
 	golang.org/x/tools v0.0.0-20191216173652-a0e659d51361 // indirect
 	google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece // indirect
 	google.golang.org/grpc v1.29.1 // indirect
 	google.golang.org/protobuf v1.24.0 // indirect
-=======
-	google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece // indirect
-	google.golang.org/grpc v1.29.1 // indirect
->>>>>>> e30e7e5cf1e4c03c945073b5e6d46fabceff385a
+
 	gopkg.in/ini.v1 v1.51.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/olivere/elastic.v5 v5.0.85
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
-<<<<<<< HEAD
+
 	xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb // indirect
-=======
->>>>>>> e30e7e5cf1e4c03c945073b5e6d46fabceff385a
+
 )
 
 replace google.golang.org/grpc => google.golang.org/grpc v1.26.0