diff options
| author | Joshua Boniface <joshua@boniface.me> | 2018-12-29 19:35:42 -0500 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2018-12-29 19:35:42 -0500 |
| commit | b306758836d64f824ef746fde89d212a41e35f56 (patch) | |
| tree | 59a49b5e15f1aaf83c6130ba6977f6587d3d06d8 | |
| parent | aac1007bdc0167c83ef150d199c27cfaed467e44 (diff) | |
Add merge=union for CONTRIBUTORS.md
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..0c0ab960a --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CONTRIBUTORS.md merge=union |