We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 3a35f58 commit c05fdc8Copy full SHA for c05fdc8
.gitattributes
@@ -1,5 +1,2 @@
1
# GitHub syntax highlighting
2
pixi.lock linguist-language=YAML linguist-generated=true
3
-
4
-# Use current branch's lock file when there are conflicts with main branch
5
-pnpm-lock.yaml merge=theirs
0 commit comments