Commit fb1c84c8 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'jv-fix-semantical-merge-conflict' into 'master'

Fix semantical merge conflict (double import)

Closes #282

See merge request gitlab-org/gitlab-workhorse!577
parents 78c75826 2f36c28a
......@@ -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) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment