fup

wagtail · Nov 15, 2023 · 84f5fa5 · 84f5fa5
1 parent bdc44b9
commit 84f5fa5
Showing 1 changed file with 0 additions and 31 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,34 +1,3 @@
-<<<<<<< HEAD
-||||||| parent of 1bfa20d (Add configurable Content-Security-Policy headers)
-[flake8]
-max-line-length = 88
-max-complexity = 8
-exclude = */migrations/*
-
-[isort]
-skip_glob=
-    env/*
-    venv/*
-    */migrations/*
-profile = black
-known_first_party = apps
-
-=======
-[flake8]
-ignore = C901,W503
-max-line-length = 88
-max-complexity = 8
-exclude = */migrations/*
-
-[isort]
-skip_glob=
-    env/*
-    venv/*
-    */migrations/*
-profile = black
-known_first_party = apps
-
->>>>>>> 1bfa20d (Add configurable Content-Security-Policy headers)
 [coverage:run]
 source = .
 omit =