From 9b42cc6191b8efcd4b603fc00c06b0cadfe8b0c0 Mon Sep 17 00:00:00 2001 From: Mart Aarma Date: Mon, 10 Apr 2023 14:05:32 +0300 Subject: [PATCH] fix: merge conflicts --- consent/strategy_default.go | 2 -- go.mod | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/consent/strategy_default.go b/consent/strategy_default.go index 1a29681f886..15f0999ea3b 100644 --- a/consent/strategy_default.go +++ b/consent/strategy_default.go @@ -14,8 +14,6 @@ import ( "github.com/ory/x/httpx" - "github.com/ory/hydra/driver/config" - "github.com/gorilla/sessions" "github.com/pborman/uuid" "github.com/pkg/errors" diff --git a/go.mod b/go.mod index be7ce17a1f1..25694b28c00 100644 --- a/go.mod +++ b/go.mod @@ -193,6 +193,7 @@ require ( github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/ryanuber/go-glob v1.0.0 // indirect github.com/seatgeek/logrus-gelf-formatter v0.0.0-20210414080842-5b05eb8ff761 // indirect github.com/segmentio/backo-go v1.0.1 // indirect github.com/sergi/go-diff v1.2.0 // indirect