1 files changed, 1 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
index e737c7946ef..2b4f3d47263 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,3 +7,4 @@
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
+Cargo.lock -merge