Merge 59fc0bce28979431ec9e9d3d6d3f41de0a2c5985 into bd4f73af679e7d645f6d0277258fa360eda96f2d

This commit is contained in:
alex 023 2018-05-09 04:51:18 +00:00 committed by GitHub
commit bd8a9f8923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions

View File

@ -19,7 +19,7 @@ import (
"github.com/gin-contrib/sse"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
"context"
)
var _ context.Context = &Context{}

7
vendor/vendor.json vendored
View File

@ -95,13 +95,6 @@
"revision": "adbae1b6b6fb4b02448a0fc0dbbc9ba2b95b294d",
"revisionTime": "2017-06-19T06:03:41Z"
},
{
"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",
"comment": "release-branch.go1.7",
"path": "golang.org/x/net/context",
"revision": "d4c55e66d8c3a2f3382d264b08e3e3454a66355a",
"revisionTime": "2016-10-18T08:54:36Z"
},
{
"checksumSHA1": "S0DP7Pn7sZUmXc55IzZnNvERu6s=",
"path": "golang.org/x/sync/errgroup",