diff --git a/go.mod b/go.mod index 353fc51c67e..d74904b2957 100644 --- a/go.mod +++ b/go.mod @@ -9,21 +9,8 @@ require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 github.com/Masterminds/semver/v3 v3.4.0 github.com/alecthomas/kong v1.14.0 -<<<<<<< HEAD - github.com/charmbracelet/bubbletea v1.3.10 - github.com/containerd/errdefs v1.0.0 - github.com/crossplane/crossplane-runtime/v2 v2.3.0-rc.0.0.20260416145853-f43d88270996 - github.com/crossplane/crossplane/apis/v2 v2.0.0-20260506160416-71e233bfd739 - github.com/crossplane/function-sdk-go v0.6.1-0.20260422203639-1c756d23b966 - github.com/docker/docker v28.5.2+incompatible - github.com/docker/go-connections v0.6.0 - github.com/emicklei/dot v1.10.0 - github.com/go-git/go-billy/v5 v5.8.0 - github.com/go-git/go-git/v5 v5.18.0 -======= github.com/crossplane/crossplane-runtime/v2 v2.4.0-rc.0 github.com/crossplane/crossplane/apis/v2 v2.0.0-20260424160951-8f231230ebb6 ->>>>>>> main github.com/google/go-cmp v0.7.0 github.com/google/go-containerregistry v0.21.2 github.com/robfig/cron/v3 v3.0.1 @@ -241,7 +228,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/component-base v0.35.0 // indirect k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4