fix: resolve go.mod merge conflict

This commit is contained in:
salvacybersec
2026-04-06 17:37:09 +03:00
parent 230dcdc98a
commit 387d2b5985

3
go.mod
View File

@@ -85,10 +85,7 @@ require (
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
<<<<<<< HEAD
=======
golang.org/x/net v0.52.0 // indirect golang.org/x/net v0.52.0 // indirect
>>>>>>> worktree-agent-a39573e4
golang.org/x/sync v0.20.0 // indirect golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.35.0 // indirect golang.org/x/text v0.35.0 // indirect