Rollup merge of #39345 - steveklabnik:carol-mailmap, r=alexcrichton

alexcrichton · alexcrichton · commit 854690c0d856 · 2017-01-27T16:42:07.000-08:00
Fix up @carols10cents' mailmap entry The previous ways didn't work; this does. cc rust-lang-nursery/thanks#45
diff --git a/.mailmap b/.mailmap
@@ -43,8 +43,8 @@ Brian Anderson <banderson@mozilla.com> <andersrb@gmail.com>
 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 <carol.nichols@gmail.com>
-Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <cnichols@thinkthroughmath.com>
+Carol (Nichols || Goulding) <carol.nichols@gmail.com>
+Carol (Nichols || Goulding) <cnichols@thinkthroughmath.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>

-Original file line number
+Diff line change
 Brian Dawn <[email protected]>
 Brian Leibig <[email protected]> Brian Leibig <[email protected]>
 Carl-Anton Ingmarsson <[email protected]> <[email protected]>
 -Carol (Nichols || Goulding) <[email protected]> Carol Nichols <[email protected]>
 -Carol (Nichols || Goulding) <[email protected]> Carol Nichols <[email protected]>
 +Carol (Nichols || Goulding) <[email protected]>
 +Carol (Nichols || Goulding) <[email protected]>
 Carol Willing <[email protected]>
 Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
 Chris Pressey <[email protected]>