Skip to content

Commit 77faf79

Browse files
oli-obkoli-obk
committed
Do not automatically merge Cargo.lock
1 parent 632ad19 commit 77faf79

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
src/etc/installer/gfx/* binary
88
*.woff binary
99
src/vendor/** -text
10+
Cargo.lock -merge

0 commit comments

Comments
 (0)