# SCM syntax highlighting & preventing 3-way merges
pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff

*.ipynb	diff=jupyternotebook

*.ipynb	merge=jupyternotebook
