.gitignore

<<<<<<< HEAD
# Can ignore specific files
.DS_Store
sct_utils.pyc

# Use wildcards as well
*~
*.swp
._*
.nfs*
*.pyc

# Can also ignore all directories and files in a directory.
tmp/**/* 
=======
.DS_Store

*~
*.swp
*.orig
._*
.#*
.nfs*
*.pyc
*.pyo
*.log
*.egg-info/
*.egg
.eggs/

.idea/*
.eggs/
/.coverage
/.cache
/bin
/python
/data
/models
tmp/**/*
spinalcordtoolbox_v*
dev/atlas/create_atlas/results
dev/atlas/validate_atlas/tmp.*
sct_testing_data

scripts/.idea/misc.xml
scripts/.idea/modules.xml
scripts/.idea/scripts.iml
scripts/.idea/vcs.xml
scripts/.idea/workspace.xml

spinalcordtoolbox/sentry_dsn.py

.pytest_cache/
unit_testing/*.csv
unit_testing/*.nii.gz
unit_testing/*.roi

.vscode/settings.json
test.sh
sct_course-london19/
sct_example_data/

# Documentation
documentation/build

>>>>>>> upstream/master