diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-01-21 23:11:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 23:11:45 +0100 |
| commit | dcbf0bf5f5f59f936f32d18b729c66f236a974da (patch) | |
| tree | 9baf95d78fe95a7d6b6424cab8e61c8877fb258a | |
| parent | 05f77ac5c2ba042cc4f96932129908a9251b08a5 (diff) | |
| parent | 9a562866b30bfc06c2fce8bb90e9798019be6eb0 (diff) | |
Rollup merge of #47637 - russmack:fix-mailmap-dupes, r=steveklabnik
Fix mailmap duplicates, Carol and Brian. This fix corrects the .mailmap file so that Carol (Nichols || Goulding) appears only once, and Brian Anderson also appears only once.
| -rw-r--r-- | .mailmap | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap index c2d3b28602b..9034aae1714 100644 --- a/.mailmap +++ b/.mailmap @@ -41,11 +41,12 @@ Boris Egorov <jightuse@gmail.com> <egorov@linux.com> Brandon Sanderson <singingboyo@gmail.com> Brandon Sanderson <singingboyo@hotmail.com> Brett Cannon <brett@python.org> Brett Cannon <brettcannon@users.noreply.github.com> Brian Anderson <banderson@mozilla.com> <andersrb@gmail.com> +Brian Anderson <banderson@mozilla.com> <banderson@mozilla.org> Brian Dawn <brian.t.dawn@gmail.com> Brian Leibig <brian@brianleibig.com> Brian Leibig <brian.leibig@gmail.com> Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com> -Carol (Nichols || Goulding) <carol.nichols@gmail.com> -Carol (Nichols || Goulding) <cnichols@thinkthroughmath.com> +Carol (Nichols || Goulding) <carol.nichols@gmail.com> <cnichols@thinkthroughmath.com> +Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <carol.nichols@gmail.com> Carol Willing <carolcode@willingconsulting.com> Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com> Chris Pressey <cpressey@gmail.com> |