Rebase

readthedocs · Mar 2, 2022 · f984ec0 · f984ec0
1 parent c3f3a64
commit f984ec0
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,6 @@
 [tox]
 minversion=2.9.0
-<<<<<<< HEAD
 envlist = py38,lint,docs
-=======
-envlist = py36,lint,docs,codespell
->>>>>>> 6dd247204 (tox.ini: [testenv:codespell])
 skipsdist = True
 
 [testenv]
@@ -31,7 +27,6 @@ commands =
         export DJANGO_SETTINGS_MODULE=readthedocs.settings.proxito.test; \
         pytest --cov-report= --cov-config {toxinidir}/.coveragerc --cov=. --cov-append -m proxito --suppress-no-test-exit-code {posargs}'
 
-
 [testenv:codespell]
 description = discover typos with codespell
 deps = codespell