diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2018-12-30 00:46:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-30 00:46:29 -0500 |
| commit | d10d632c489b94566bbcf1b7e9c2bb86c31c97b1 (patch) | |
| tree | a0fcc6a59c597f7c288dd3619c7e72bf97d2e0ea | |
| parent | 9d91fa8ab8bb1e429d45cf2c0fe54f59c59dff4d (diff) | |
| parent | b306758836d64f824ef746fde89d212a41e35f56 (diff) | |
Merge pull request #323 from joshuaboniface/gitattributes
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 |