Fix marker

Author: adamtheturtle

dev-requirements.txt

@@ -9,7 +9,6 @@ freezegun==0.3.10  # Freeze time in tests
 hypothesis==3.50.2  # Generate test cases
 isort==4.3.4  # Lint imports
 mypy==0.570  # Type checking
->>>>>>> origin/master
 pip_check_reqs==2.0.1
 pydocstyle==2.1.1  # Lint docstrings
 pyenchant==2.0.0  # Bindings for a spellchecking sytem