Skip to content

Commit a3c06b9

Browse files
committed
[DEVOPS-693] re-apply recommendations by pixi for lock file
1 parent 713aa7d commit a3c06b9

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

.gitattributes

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
*.geoh5 filter=lfs diff=lfs merge=lfs -text
33
*.h5 filter=lfs diff=lfs merge=lfs -text
44
*.min.js filter=lfs diff=lfs merge=lfs -text
5+
56
# SCM syntax highlighting & preventing 3-way merges
6-
pixi.lock linguist-language=YAML linguist-generated=true
7-
poetry.lock linguist-language=YAML linguist-generated=true
8-
*-lock.yml linguist-language=YAML linguist-generated=true
7+
pixi.lock merge=binary linguist-language=YAML linguist-generated=true
8+
poetry.lock merge=binary linguist-language=YAML linguist-generated=true
9+
*-lock.yml merge=binary linguist-language=YAML linguist-generated=true

0 commit comments

Comments
 (0)