Update .gitignore

.gitignore

@@ -20,10 +20,7 @@ parts/
 sdist/
 var/
 wheels/
-<<<<<<< ours
 pip-wheel-metadata/
-=======
->>>>>>> theirs
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -53,10 +50,7 @@ coverage.xml
 *.py,cover
 .hypothesis/
 .pytest_cache/
-<<<<<<< ours
-=======
 cover/
->>>>>>> theirs
 
 # Translations
 *.mo
@@ -79,10 +73,7 @@ instance/
 docs/_build/
 
 # PyBuilder
-<<<<<<< ours
-=======
 .pybuilder/
->>>>>>> theirs
 target/
 
 # Jupyter Notebook
@@ -93,13 +84,9 @@ profile_default/
 ipython_config.py
 
 # pyenv
-<<<<<<< ours
-.python-version
-=======
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
 # .python-version
->>>>>>> theirs
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -108,9 +95,6 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
-<<<<<<< ours
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-=======
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
@@ -129,7 +113,6 @@ ipython_config.py
 .pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
->>>>>>> theirs
 __pypackages__/
 
 # Celery stuff
@@ -163,11 +146,8 @@ venv.bak/
 .dmypy.json
 dmypy.json
 
-<<<<<<< ours
 # Pyre type checker
 .pyre/
 
 docs/
-=======
 .DS_Store
->>>>>>> theirs