Skip to content

Commit 8bf346b

Browse files
committed
chore(vale): disable red hat's merge conflict check
This check is rudimentary and incorrectly tags RST titles as merge conflict notes. As such it should be disabled until it's made aware of RST syntax. Signed-off-by: Randolph Sapp <rs@ti.com>
1 parent dfa28d3 commit 8bf346b

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

.vale.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ Vocab = PSDK
99
BasedOnStyles = RedHat
1010
RedHat.PascalCamelCase = NO
1111
RedHat.GitLinks = NO
12+
RedHat.MergeConflictMarkers = NO

0 commit comments

Comments
 (0)