Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit dcbf0bf

Browse files
authoredJan 21, 2018
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.
2 parents 05f77ac + 9a56286 commit dcbf0bf

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed
 

‎.mailmap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ Boris Egorov <jightuse@gmail.com> <egorov@linux.com>
4141
Brandon Sanderson <singingboyo@gmail.com> Brandon Sanderson <singingboyo@hotmail.com>
4242
Brett Cannon <brett@python.org> Brett Cannon <brettcannon@users.noreply.github.com>
4343
Brian Anderson <banderson@mozilla.com> <andersrb@gmail.com>
44+
Brian Anderson <banderson@mozilla.com> <banderson@mozilla.org>
4445
Brian Dawn <brian.t.dawn@gmail.com>
4546
Brian Leibig <brian@brianleibig.com> Brian Leibig <brian.leibig@gmail.com>
4647
Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com>
47-
Carol (Nichols || Goulding) <carol.nichols@gmail.com>
48-
Carol (Nichols || Goulding) <cnichols@thinkthroughmath.com>
48+
Carol (Nichols || Goulding) <carol.nichols@gmail.com> <cnichols@thinkthroughmath.com>
49+
Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <carol.nichols@gmail.com>
4950
Carol Willing <carolcode@willingconsulting.com>
5051
Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com>
5152
Chris Pressey <cpressey@gmail.com>

0 commit comments

Comments
 (0)
Please sign in to comment.