Merge branch 'master' into collation-server

pingcap · Apr 9, 2021 · 19ceee8 · 19ceee8
2 parents 2e8e2be + ab72cfa
commit 19ceee8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/store/tikv/unionstore/union_iter.go b/store/tikv/unionstore/union_iter.go
@@ -15,7 +15,7 @@ package unionstore
 
 import (
 	tidbkv "github.com/pingcap/tidb/kv"
-	"github.com/pingcap/tidb/util/logutil"
+	"github.com/pingcap/tidb/store/tikv/logutil"
 	"go.uber.org/zap"
 )