diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-03-23 16:22:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 16:22:56 +0800 |
| commit | 3fa0fa713bc1508835bdecd7dea78ff09803e327 (patch) | |
| tree | 6a5d4a7dcfd72489bd4f7df70f5188a636947c24 /rpc/inproc.go | |
| parent | 525116dbff916825463931361f75e75e955c12e2 (diff) | |
| parent | f1534f5797664856218c8347366488f37f1e7924 (diff) | |
| download | go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.gz go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.bz2 go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.lz go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.xz go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.tar.zst go-tangerine-3fa0fa713bc1508835bdecd7dea78ff09803e327.zip | |
Merge pull request #3809 from fjl/all-use-normal-context
all: import "context" instead of "golang.org/x/net/context"
Diffstat (limited to 'rpc/inproc.go')
| -rw-r--r-- | rpc/inproc.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rpc/inproc.go b/rpc/inproc.go index f72b97497..595a7ca65 100644 --- a/rpc/inproc.go +++ b/rpc/inproc.go @@ -17,9 +17,8 @@ package rpc import ( + "context" "net" - - "golang.org/x/net/context" ) // NewInProcClient attaches an in-process connection to the given RPC server. |