Fix semantical merge conflict (double import)

2f36c28a · Jacob Vosmaer · a4937ce2 · 2f36c28a
Commit 2f36c28a authored Aug 26, 2020 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

authorization_test.go authorization_test.go +0 -2

No files found.
--- a/authorization_test.go
+++ b/authorization_test.go
@@ -15,8 +15,6 @@ import (
 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/secret"
 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/upstream/roundtripper"
-
-	"github.com/stretchr/testify/require"
 )

 func okHandler(w http.ResponseWriter, _ *http.Request, _ *api.Response) {