Merge pull request #81 from ubuntu/resolve-lock

ubuntu · Feb 21, 2024 · c69f383 · c69f383
2 parents d47dd21 + 36e187c
commit c69f383
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+Cargo.lock merge=ours