Update styles/Datadog/merge_conflict.yaml

hestonhoffman · web-flow · commit fc65b349e4e9 · 2024-11-21T10:06:13.000-08:00
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'
+  - '\>\>\>\>\>\>\>'
