summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-10-20 09:40:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-10-20 09:40:42 +0000
commitee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch)
treef8479f94a28f66654c6a4f6fb99bad6b4e86a40e /.gitattributes
parent62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff)
downloadgitlab-ce-ee664acb356f8123f4f6b00b73c1e1cf0866c7fb.tar.gz
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 720e5f62549..1f5d554ef25 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,4 @@
VERSION merge=ours
Dangerfile gitlab-language=ruby
-*.pdf filter=lfs diff=lfs merge=lfs -text
*.rb diff=ruby
workhorse/testdata/*.pdf -filter -diff -merge