From 7b416f84e4e86778ff4f511de2eb2fb530ac075d Mon Sep 17 00:00:00 2001
From: grac3gao <gracegao@google.com>
Date: Tue, 15 Dec 2020 17:51:43 -0800
Subject: [PATCH] solve conflict

---
 go.mod             | 1 +
 vendor/modules.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/go.mod b/go.mod
index d9589e5302..b625ed6a49 100644
--- a/go.mod
+++ b/go.mod
@@ -23,6 +23,7 @@ require (
 	go.uber.org/multierr v1.6.0
 	go.uber.org/zap v1.16.0
 	golang.org/x/net v0.0.0-20201209123823-ac852fbbde11
+	golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	google.golang.org/api v0.36.0
 	google.golang.org/genproto v0.0.0-20201211151036-40ec1c210f7a
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4c7f5f623d..b9998b56a8 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -400,6 +400,7 @@ golang.org/x/net/internal/timeseries
 golang.org/x/net/netutil
 golang.org/x/net/trace
 # golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
+## explicit
 golang.org/x/oauth2
 golang.org/x/oauth2/google
 golang.org/x/oauth2/internal