diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 18:08:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 18:08:01 +0000 |
| commit | 8e45d25f7dde6508839ffee719c0ddc2cf6b12d3 (patch) | |
| tree | 9839e7fe63b36904d40995ebf519124c9a8f7681 /.gitattributes | |
| parent | 00c78fb814d7ce00989ac04edd6cdaa3239da284 (diff) | |
| download | gitlab-ce-8e45d25f7dde6508839ffee719c0ddc2cf6b12d3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 0b87a97df9c..55c422f0f8c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ VERSION merge=ours Dangerfile gitlab-language=ruby -db/schema.rb merge=merge_db_schema |