solve conflict

Signed-off-by: Spade A <[email protected]>
pingcap · Jul 5, 2023 · 149df1a · 149df1a
1 parent 3788ab4
commit 149df1a
Show file tree

Hide file tree

Showing 4 changed files with 195 additions and 147 deletions.
diff --git a/pkg/configpb/configpb.pb.gw.go b/pkg/configpb/configpb.pb.gw.go