diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-11-15 17:04:33 +0200 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-11-15 17:04:33 +0200 |
| commit | 59189438388191c044c0697d5bfb571693d95978 (patch) | |
| tree | 6871c5de96b90ae6e478aabb8269583c794367b5 /.gitattributes | |
| parent | 37abb20cec2a9836a7d1d70a7f7535af6646df1e (diff) | |
| download | gitlab-ce-59189438388191c044c0697d5bfb571693d95978.tar.gz | |
Remove gitattribute entry for CHANGELOG.mdrs-disable-changelog-merge
[ci skip]
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index ab791a4cd6c..70cce05d2b5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -CHANGELOG.md merge=union *.js.es6 gitlab-language=javascript |