[commit: ghc] master: arclint: ReST doesn't need ArcanistMergeConflictLinter (0afba67)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0afba67f703ab0ba8cd041167144169d67e14501/ghc

>---------------------------------------------------------------

commit 0afba67f703ab0ba8cd041167144169d67e14501
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Oct 23 17:25:59 2015 +0200

    arclint: ReST doesn't need ArcanistMergeConflictLinter
    
    The section heading syntax trips up this linter. Fixes #10979.


>---------------------------------------------------------------

0afba67f703ab0ba8cd041167144169d67e14501
 .arclint | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.arclint b/.arclint
index 5642c63..8df5653 100644
--- a/.arclint
+++ b/.arclint
@@ -7,7 +7,8 @@
       "type": "generated"
     },
     "merge-conflict": {
-      "type": "merge-conflict"
+      "type": "merge-conflict",
+      "exclude": "(\\.rst$)",
     },
     "nolint": {
       "type": "nolint"