Preserve rust config files during merge

Sh1Yo · May 22, 2023 · beabc96 · beabc96
1 parent 9807ead
commit beabc96
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/.gitattributes b/src/.gitattributes
@@ -0,0 +1,2 @@
+Cargo.toml merge=ours
+Cargo.lock merge=ours