This is an automated cherry-pick of #16564

Signed-off-by: ti-chi-bot <[email protected]>
pingcap · Feb 29, 2024 · 76b206a · 76b206a
1 parent aa4d3aa
commit 76b206a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/tikv-configuration-file.md b/tikv-configuration-file.md
@@ -2066,7 +2066,11 @@ Configuration items related to TiDB Lightning import and BR restore.
 + The garbage ratio threshold to trigger GC.
 + Default value: `1.1`
 
+<<<<<<< HEAD
 ### `num-threads` <span class="version-mark">New in v6.5.8 and v7.6.0</span>
+=======
+### `num-threads` <span class="version-mark">New in v6.5.8 and v7.5.1</span>
+>>>>>>> 773c3e52ff (v7.5.1: tikv configuration doc: add gc thread number (#16564))
 
 + The number of GC threads when `enable-compaction-filter` is `false`.
 + Default value: `1`