File tree Expand file tree Collapse file tree 4 files changed +16
-0
lines changed
Expand file tree Collapse file tree 4 files changed +16
-0
lines changed Original file line number Diff line number Diff line change 11module github.com/tikv/pd/client
22
3+ <<<<<<< HEAD
34go 1.23.12
5+ =======
6+ go 1.25.6
7+ >>>>>>> a1f2017a6c (chore(go): bump Go version to 1.25.6 across modules (#10211))
48
59require (
610 github.com/BurntSushi/toml v0.3.1
Original file line number Diff line number Diff line change 11module github.com/tikv/pd
22
3+ <<<<<<< HEAD
34go 1.23.12
5+ =======
6+ go 1.25.6
7+ >>>>>>> a1f2017a6c (chore(go): bump Go version to 1.25.6 across modules (#10211))
48
59// When you modify PD cooperatively with kvproto, this will be useful to submit the PR to PD and the PR to
610// kvproto at the same time. You can run `go mod tidy` to make it replaced with go-mod style specification.
Original file line number Diff line number Diff line change 11module github.com/tikv/pd/tests/integrations
22
3+ <<<<<<< HEAD
34go 1.23.12
5+ =======
6+ go 1.25.6
7+ >>>>>>> a1f2017a6c (chore(go): bump Go version to 1.25.6 across modules (#10211))
48
59replace (
610 github.com/tikv/pd => ../../
Original file line number Diff line number Diff line change 11module github.com/tikv/pd/tools
22
3+ <<<<<<< HEAD
34go 1.23.12
5+ =======
6+ go 1.25.6
7+ >>>>>>> a1f2017a6c (chore(go): bump Go version to 1.25.6 across modules (#10211))
48
59replace (
610 github.com/tikv/pd => ../
You can’t perform that action at this time.
0 commit comments