Skip to content

Commit

Permalink
meta: align collaborator email in .mailmap/AUTHORS with README
Browse files Browse the repository at this point in the history
Use the most recent and presumably preferred email for a collaborator
whose .mailmap and README entries differ.

PR-URL: #39478
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
  • Loading branch information
Trott authored and targos committed Jul 25, 2021
1 parent 4df65fd commit d277e5a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ Kazuyuki Yamada <tasogare.pg@gmail.com>
Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
Ke Ding <dingkework@hotmail.com>
Khaidi Chu <admin@xcoder.in>
Khaidi Chu <admin@xcoder.in> <i@2333.moe>
Khaidi Chu <i@2333.moe>
Khaidi Chu <i@2333.moe> <admin@xcoder.in>
Kimberly Wilber <gcr@sneakygcr.net>
Kimberly Wilber <gcr@sneakygcr.net> <gcr@users.noreply.github.com>
Kiyoshi Nomo <tokyoincidents.g@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -1494,7 +1494,7 @@ Sreepurna Jasti <sreepurna.jasti@gmail.com>
Rafael Fragoso <rafaelfragosom@gmail.com>
Andrei Cioromila <andrei.cioromila@gmail.com>
Frank Lanitz <frank@frank.uvena.de>
Khaidi Chu <admin@xcoder.in>
Khaidi Chu <i@2333.moe>
Akshay Iyer <c.m.akshay.iyer@gmail.com>
Rick Bullotta <RickBullotta@users.noreply.github.com>
Rajaram Gaunker <zimbabao@gmail.com>
Expand Down

0 comments on commit d277e5a

Please sign in to comment.