summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2021-08-08 06:49:11 -0700
committerMichaël Zasso <targos@protonmail.com>2021-09-04 15:14:49 +0200
commit1eda8442bd679d61059f558ffe0168d15d621ae5 (patch)
tree684acfe74cd4a7abc5b804191ce9814301384551
parentcd67d86572ab739fb8cf541a974ca52191129dbb (diff)
downloadnode-new-1eda8442bd679d61059f558ffe0168d15d621ae5.tar.gz
meta: consolidate AUTHORS entries for samshull
PR-URL: https://github.com/nodejs/node/pull/39705 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS1
2 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index f551c22cfd..1c1d1cedcb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -349,6 +349,7 @@ Sam Mikes <smikes@cubane.com>
Sam P Gallagher-Bishop <samgallagherb@gmail.com> <SPGB@users.noreply.github.com>
Sam Roberts <vieuxtech@gmail.com> <sam@strongloop.com>
Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
+Sam Shull <brickysam26@gmail.com> <sam+github@samshull.com>
Sam Shull <brickysam26@gmail.com> <sshull@squaremouth.com>
Samuel Attard <samuel.r.attard@gmail.com> <sattard@slack-corp.com>
Samantha Sample <ssample812@gmail.com> <=>
diff --git a/AUTHORS b/AUTHORS
index e371702695..1963dc33cb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1271,7 +1271,6 @@ amrios <amrios@us.ibm.com>
Chris Henney <CHenney@walmartlabs.com>
Yojan Shrestha <sickgrin@gmail.com>
Rodrigo Palma <rpalma@mx1.ibm.com>
-Sam Shull <sam+github@samshull.com>
Michael-Bryant Choa <mbchoa@gmail.com>
CodeVana <codevaana@gmail.com>
Daniel Sims <danielsims@quickenloans.com>