From 1eda8442bd679d61059f558ffe0168d15d621ae5 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 8 Aug 2021 06:49:11 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for samshull
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .mailmap | 1 +
 AUTHORS  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index f551c22cfd3d50..1c1d1cedcbf213 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 e37170269502d4..1963dc33cb60a4 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>