summaryrefslogtreecommitdiff
path: root/doc/user/project/git_attributes.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 18:18:33 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 18:18:33 +0000
commitf64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch)
treea2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /doc/user/project/git_attributes.md
parentbfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff)
downloadgitlab-ce-7f049e661d257321a8fa9ac9d5f98ed7494ef266.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'doc/user/project/git_attributes.md')
-rw-r--r--doc/user/project/git_attributes.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/git_attributes.md b/doc/user/project/git_attributes.md
index 2806f6e48d1..11d1db195e1 100644
--- a/doc/user/project/git_attributes.md
+++ b/doc/user/project/git_attributes.md
@@ -17,7 +17,7 @@ directory of your repository and push it to the default branch of your project.
## Encoding Requirements
The `.gitattributes` file _must_ be encoded in UTF-8 and _must not_ contain a
-Byte Order Mark. If a different encoding is used, the file's contents will be
+Byte Order Mark. If a different encoding is used, the file's contents are
ignored.
## Syntax Highlighting