Revert "tech: use context package over xperimental version"

This reverts commit 99f1c30071.
8 years ago · 70b36a02af
parent 99f1c30071
commit 70b36a02af
2 changed files with 2 additions and 2 deletions
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@ -12,7 +12,7 @@ import (
 	"net/http"
 	"net/url"

-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"

 	"github.com/grafana/grafana/pkg/bus"
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"

-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"

 	"github.com/grafana/grafana/pkg/setting"