summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-07-26 13:29:46 +0100
committerRichard van der Hoff <richard@matrix.org>2016-07-26 13:29:46 +0100
commit9ad8d9b17c398130ce66206199cf2a903026cc56 (patch)
tree2c17ec0dc88469486edfee37dfdf8025360dec9a /setup.cfg
parentDelete refresh tokens when deleting devices (diff)
parentMerge pull request #951 from matrix-org/rav/flake8 (diff)
downloadsynapse-9ad8d9b17c398130ce66206199cf2a903026cc56.tar.xz
Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device
Diffstat (limited to 'setup.cfg')
-rw-r--r--setup.cfg6
1 files changed, 2 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg
index 5ebce1c56b..da8eafbb39 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,5 @@ ignore =
 
 [flake8]
 max-line-length = 90
-ignore = W503 ; W503 requires that binary operators be at the end, not start, of lines. Erik doesn't like it.
-
-[pep8]
-max-line-length = 90
+#  W503 requires that binary operators be at the end, not start, of lines. Erik doesn't like it.
+ignore = W503