Remove -merge from Cargo.lock gitattributes

This commit is contained in:
Noa authored and Jeong, YunWon committed 2025-03-20 14:28:03 +09:00
1 parent a6b4ef7f5d
commit bfe72689fc
1 file changed
+1 -1
+1 -1
View File
@@ -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