From 02f90a0543158a78478b675b8bce12c82ffe1850 Mon Sep 17 00:00:00 2001 From: Tim Sonnenberg Date: Wed, 29 Jan 2025 16:47:18 +0100 Subject: [PATCH] fix merge conflicts --- go.mod | 3 --- go.sum | 2 -- 2 files changed, 5 deletions(-) diff --git a/go.mod b/go.mod index d072c0656d..bc084a7a66 100644 --- a/go.mod +++ b/go.mod @@ -883,9 +883,6 @@ require ( github.com/containers/common v0.61.0 // indirect github.com/deneonet/benc v1.1.2 // indirect github.com/itchyny/timefmt-go v0.1.6 // indirect - github.com/onsi/ginkgo/v2 v2.21.0 // indirect - github.com/onsi/gomega v1.35.1 // indirect - go.etcd.io/bbolt v1.3.11 // indirect ) // NOTE: replace directives below must always be *temporary*. diff --git a/go.sum b/go.sum index 355e180f41..a5562f8eb4 100644 --- a/go.sum +++ b/go.sum @@ -1852,8 +1852,6 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gosnmp/gosnmp v1.37.0 h1:/Tf8D3b9wrnNuf/SfbvO+44mPrjVphBhRtcGg22V07Y= -github.com/gosnmp/gosnmp v1.37.0/go.mod h1:GDH9vNqpsD7f2HvZhKs5dlqSEcAS6s6Qp099oZRCR+M= github.com/gosnmp/gosnmp v1.38.0 h1:I5ZOMR8kb0DXAFg/88ACurnuwGwYkXWq3eLpJPHMEYc= github.com/gosnmp/gosnmp v1.38.0/go.mod h1:FE+PEZvKrFz9afP9ii1W3cprXuVZ17ypCcyyfYuu5LY= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=