summaryrefslogtreecommitdiff
path: root/.arclint
diff options
context:
space:
mode:
Diffstat (limited to '.arclint')
-rw-r--r--.arclint3
1 files changed, 2 insertions, 1 deletions
diff --git a/.arclint b/.arclint
index 5642c63a92..8df5653a23 100644
--- a/.arclint
+++ b/.arclint
@@ -7,7 +7,8 @@
"type": "generated"
},
"merge-conflict": {
- "type": "merge-conflict"
+ "type": "merge-conflict",
+ "exclude": "(\\.rst$)",
},
"nolint": {
"type": "nolint"