diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-02-24 14:22:40 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-02-24 14:22:40 +0000 |
| commit | d199338628cf2395bf19106cd39d0cff0de979b0 (patch) | |
| tree | c3d3c3d51939bc94008202da9da5645676a95772 | |
| parent | 97d76cb27ab43d5e75d80b2cecfe9585173e7429 (diff) | |
| parent | dfde2628b806c9d1b2724fd47c52326d5a92c803 (diff) | |
| download | gitlab-ci-d199338628cf2395bf19106cd39d0cff0de979b0.tar.gz | |
Merge branch 'gitattributes' into 'master'
Merge union CHANGELOG
See merge request !42
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..437485e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +CHANGELOG merge=union + |