dyscolab
diff --git a/‎.gitattributes‎
Lines changed: 2 additions & 0 deletions b/‎.gitattributes‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 4 additions & 1 deletion b/‎.gitignore‎
Lines changed: 4 additions & 1 deletion
@@ -0,0 +1,2 @@
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true
@@ -1,2 +1,5 @@
 /site
-trace.json
+trace.json
+# pixi environments
+.pixi/*
+!.pixi/config.toml
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# SCM syntax highlighting & preventing 3-way merges`
	`2`	`+pixi.lock merge=binary linguist-language=YAML linguist-generated=true`