Merge pull request #1595 from ipfs/hotfix-venodr

jbenet · jbenet · commit 4cef86298e8b · 2015-08-20T18:22:56.000+02:00
fix master: make vendor
diff --git a/merkledag/utils/diff.go b/merkledag/utils/diff.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"path"
 
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 	key "github.com/ipfs/go-ipfs/blocks/key"
 	dag "github.com/ipfs/go-ipfs/merkledag"
-	context "golang.org/x/net/context"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"path"`
`7`	`7`
	`8`	`+ context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"`
`8`	`9`	`key "github.com/ipfs/go-ipfs/blocks/key"`
`9`	`10`	`dag "github.com/ipfs/go-ipfs/merkledag"`
`10`		`- context "golang.org/x/net/context"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`