diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-27 14:41:27 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-27 16:42:07 -0800 |
| commit | 854690c0d85654a49bf4d1de870704c25d5e62d4 (patch) | |
| tree | 7ed398abd8fcbbb379c524e1502c315c6f989800 | |
| parent | 7c75608cfb8205c35c827f8c531e18315e1f275d (diff) | |
| parent | 0f2a5f686f3fbc3d66dce301e965b43d5c3acd63 (diff) | |
| download | rust-854690c0d85654a49bf4d1de870704c25d5e62d4.tar.gz rust-854690c0d85654a49bf4d1de870704c25d5e62d4.zip | |
Rollup merge of #39345 - steveklabnik:carol-mailmap, r=alexcrichton
Fix up @carols10cents' mailmap entry The previous ways didn't work; this does. cc rust-lang-nursery/thanks#45
| -rw-r--r-- | .mailmap | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap index be18190e12b..90a5e0f5f32 100644 --- 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> |