fix: resolve go.mod merge conflict
This commit is contained in:
3
go.mod
3
go.mod
@@ -85,10 +85,7 @@ require (
|
||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
||||
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
golang.org/x/net v0.52.0 // indirect
|
||||
>>>>>>> worktree-agent-a39573e4
|
||||
golang.org/x/sync v0.20.0 // indirect
|
||||
golang.org/x/sys v0.42.0 // indirect
|
||||
golang.org/x/text v0.35.0 // indirect
|
||||
|
||||
Reference in New Issue
Block a user