Skip to content

Commit a7aa844

Browse files
jorisvjorisv
committed
git: Update pixi.lock attributes
1 parent 348b466 commit a7aa844

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎.gitattributes‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# GitHub syntax highlighting
2-
pixi.lock linguist-language=YAML linguist-generated=true
1+
# SCM syntax highlighting & preventing 3-way merges
2+
pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff

0 commit comments

Comments
 (0)