small refactoring

2024-09-20 16:50:48 +00:00 · 2022-07-11 23:14:00 +03:00 · 2022-07-11 23:14:00 +03:00 · fb5272971c
commit fb5272971c
parent 86b0e4cfc8
1 changed files with 0 additions and 4 deletions
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@ -1035,7 +1035,3 @@ Examples of working configurations can be found in integration tests directory (
 -   `_part_uuid` — Unique part identifier (if enabled MergeTree setting `assign_part_uuids`).
 -   `_partition_value` — Values (a tuple) of a `partition by` expression.
 -   `_sample_factor` — Sample factor (from the query).
-<<<<<<< HEAD
-
-=======
->>>>>>> b08c032f8fc64d398045ad21324b5269cf5cd171