From 43f5166c11594828cae1d7bd07320541f8f96cb4 Mon Sep 17 00:00:00 2001 From: Noa Date: Wed, 19 Mar 2025 21:42:33 -0500 Subject: [PATCH] Remove -merge from Cargo.lock gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 0c4ae3d850..f54bcd3b72 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ Lib/** linguist-vendored -Cargo.lock linguist-generated -merge +Cargo.lock linguist-generated *.snap linguist-generated -merge vm/src/stdlib/ast/gen.rs linguist-generated -merge Lib/*.py text working-tree-encoding=UTF-8 eol=LF