summaryrefslogtreecommitdiffstats
path: root/.arclint
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-04-14 20:28:04 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-04-14 20:28:04 +0200
commitbd61e89e10228f2cac379bf7b4278f33287db627 (patch)
tree5597140f883e69f33a3688c3818fec7d43a0f125 /.arclint
parent1c5bb7f15ce531f9bd9739423c0facac58574e66 (diff)
downloadpykolab-bd61e89e10228f2cac379bf7b4278f33287db627.tar.gz
Add a linter to detect merge conflicts
Diffstat (limited to '.arclint')
-rw-r--r--.arclint3
1 files changed, 3 insertions, 0 deletions
diff --git a/.arclint b/.arclint
index b1cfaa0..6ebf150 100644
--- a/.arclint
+++ b/.arclint
@@ -1,5 +1,8 @@
{
"linters": {
+ "merge-conflict": {
+ "type": "merge-conflict"
+ },
"pep8": {
"type": "pep8",
"include": "(\\.py$)",