Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SCM syntax highlighting & preventing 3-way merges
pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ ENV/
env.bak/
venv.bak/

# pixi environments
.pixi/*
!.pixi/config.toml

# Spyder project settings
.spyderproject
.spyproject
Expand Down
33 changes: 0 additions & 33 deletions envs/environment-user.yaml

This file was deleted.

Loading
Loading