diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-07-26 00:55:00 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-07-26 00:55:00 +0100 |
| commit | c36d1b162c2a02ae61a4b7b62b6e96df6cb7e9e0 (patch) | |
| tree | 99bbaac69a1b7bf4b70b431f62796938d66f295f /.gitattributes | |
| parent | 9fead2b8271c4f3bb6c04a596253f80b09de9caa (diff) | |
| download | gitlab-ce-c36d1b162c2a02ae61a4b7b62b6e96df6cb7e9e0.tar.gz | |
Added '*.js.es6 gitlab-language=javascript' to .gitattributes
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 7e800609e6c..17cbaa5eef5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -CHANGELOG merge=union
\ No newline at end of file +CHANGELOG merge=union +*.js.es6 gitlab-language=javascript |