summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 1f9ed1f7..d63b5dec 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
vendor/** -diff -merge linguist-vendored gitlab-generated
-Cargo.lock -diff -merge linguist-generated gitlab-generated