fix conflict

pingcap · Sep 7, 2020 · ca720fc · ca720fc
1 parent dec5b93
commit ca720fc
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/executor/show_test.go b/executor/show_test.go
@@ -16,6 +16,7 @@ package executor_test
 import (
 	"context"
 	"fmt"
+	"github.com/pingcap/tidb/privilege/privileges"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"