diff options
author | Matthew Hodgson <matthew@matrix.org> | 2018-06-10 12:26:14 +0300 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-10 12:26:14 +0300 |
commit | c96d882a02924a26f69c75cb988b06f3015d7578 (patch) | |
tree | 4b2fd1bea90831955841dfb33753ac553c439104 /setup.cfg | |
parent | Merge branch 'develop' into matthew/filter_members (diff) | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-c96d882a02924a26f69c75cb988b06f3015d7578.tar.xz |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'setup.cfg')
-rw-r--r-- | setup.cfg | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg index da8eafbb39..fa6f2d1ce4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,4 +17,5 @@ ignore = [flake8] max-line-length = 90 # W503 requires that binary operators be at the end, not start, of lines. Erik doesn't like it. -ignore = W503 +# E203 is contrary to PEP8. +ignore = W503,E203 |