From 0afba67f703ab0ba8cd041167144169d67e14501 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 23 Oct 2015 17:25:59 +0200
Subject: arclint: ReST doesn't need ArcanistMergeConflictLinter

The section heading syntax trips up this linter. Fixes #10979.
---
 .arclint | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.arclint')

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"
-- 
cgit v1.2.1