Merge branch 'main' into conda-package-metadata

scipp · Feb 10, 2025 · e2e9ea1 · e2e9ea1
2 parents 919738b + 6e0e549
commit e2e9ea1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2,608 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,8 @@ dist
 html
 .tox
 *.egg-info
-uv.lock  # we lock dependencies with pip-compile, not uv
+# we lock dependencies with pip-compile, not uv
+uv.lock
 
 *.sw?
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,8 @@ dist @@
     html
     .tox
     *.egg-info
-    uv.lock  # we lock dependencies with pip-compile, not uv
+    # we lock dependencies with pip-compile, not uv
+    uv.lock
     *.sw?
@@ Expand Down @@