*: upgrade client-go

Signed-off-by: Weizhen Wang <[email protected]>
pingcap · Dec 22, 2023 · 7b9ce97 · 7b9ce97
1 parent c5dd8d9
commit 7b9ce97
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 startup --host_jvm_args=-Xmx5g
-=======
-startup --host_jvm_args=-Xmx8g
->>>>>>> 6f45f81f3d4 (statistics/handle: refine the condition of dumping stats delta (#41133))
 startup --unlimit_coredumps
 
 run:ci --color=yes