fix

Signed-off-by: Ryan Leung <[email protected]>
pingcap · Jan 21, 2025 · d1ebcbd · d1ebcbd
1 parent e25e4ae
commit d1ebcbd
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/store/driver/tikv_driver.go b/store/driver/tikv_driver.go
@@ -18,11 +18,8 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-<<<<<<< HEAD:store/driver/tikv_driver.go
-	"math/rand"
-=======
 	"math"
->>>>>>> a5e07a2ed36 (store/driver: set `MaxCallRecvMsgSize` to `MaxInt32` for pd client (#56278)):pkg/store/driver/tikv_driver.go
+	"math/rand"
 	"net/url"
 	"strings"
 	"sync"