Fix .gitignore

Author: rodvrees

.gitignore

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 385d700 (checkout dev)
 # Others
 nbs/
 .prettierrc
@@ -113,128 +109,5 @@ ENV/
 .pytest_cache/
 IM2Deep.code-workspace
 
-<<<<<<< HEAD
 # Testing
 test_data/
-=======
-# Others
-nbs/
-.prettierrc
-data/
-steps.txt
-old_files/
-prepare_pin_files.py
-*.jar
-*.tar
-
-# Ruff
-.ruff_cache/
-
-# Atom remote-sync config
-.remote-sync.json
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# IPython Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# dotenv
-.env
-
-# virtualenv
-venv/
-ENV/
-.venv*/
-
-# Spyder project settings
-.spyderproject
-
-# Rope project settings
-.ropeproject
-
-# vscode
-.vscode/
-.pytest_cache/
-IM2Deep.code-workspace
-
-# Testing purposes
-test_data/
->>>>>>> c874758 (use_single_model argument extra information)
-=======
-# Testing purposes
-test_data/
-
-# Testing purposes
-test_data/
->>>>>>> 385d700 (checkout dev)