-

OskarStark · OskarStark · commit 65294fdc0f8a · 2023-02-03T13:53:53.000+01:00
diff --git a/.doctor-rst.yaml b/.doctor-rst.yaml
@@ -54,6 +54,7 @@ rules:
     versionadded_directive_should_have_version: ~
     yaml_instead_of_yml_suffix: ~
     yarn_dev_option_at_the_end: ~
+    no_merge_conflict:
 
     #   master
     versionadded_directive_major_version:
