Update styles/Datadog/merge_conflict.yaml

DataDog · Nov 21, 2024 · fc65b34 · fc65b34
1 parent 2ed848d
commit fc65b34
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/styles/Datadog/merge_conflict.yaml b/styles/Datadog/merge_conflict.yaml
@@ -4,4 +4,4 @@ link: 'https://github.com/DataDog/documentation/blob/master/CONTRIBUTING.md'
 ignorecase: true
 level: error
 tokens:
-  - '\<\<\< HEAD'
+  - '\>\>\>\>\>\>\>'