Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
efd6 authored Sep 22, 2023
1 parent c2d8548 commit 29b2e3c
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,8 @@ require (
github.com/elastic/elastic-agent-libs v0.3.13
github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3
github.com/elastic/elastic-agent-system-metrics v0.6.1
<<<<<<< HEAD
github.com/elastic/go-elasticsearch/v8 v8.9.0
github.com/elastic/mito v1.5.0
=======
github.com/elastic/go-elasticsearch/v8 v8.10.0
github.com/elastic/mito v1.6.0
>>>>>>> ea3b9e34bd (x-pack/filebeat/input/cel: update mito version to v1.6.0 (#36651))
github.com/elastic/toutoumomoma v0.0.0-20221026030040-594ef30cb640
github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15
github.com/google/cel-go v0.15.3
Expand Down

0 comments on commit 29b2e3c

Please sign in to comment.