From bb06282a9edcf3b463f267088dfa154af59fe7fe Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 3 Aug 2021 07:02:18 -0700
Subject: [PATCH] meta: consolidate email addresses for MarshallOfSound

PR-URL: https://github.com/nodejs/node/pull/39651
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 82c0db7c908156..f551c22cfd3d50 100644
--- a/.mailmap
+++ b/.mailmap
@@ -350,6 +350,7 @@ 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> <sshull@squaremouth.com>
+Samuel Attard <samuel.r.attard@gmail.com> <sattard@slack-corp.com>
 Samantha Sample <ssample812@gmail.com> <=>
 Sambasiva Suda <sambasivarao@gmail.com>
 San-Tai Hsu <v@fatpipi.com>
diff --git a/AUTHORS b/AUTHORS
index 2c85305c4d25f4..36aecfcf3fe2c9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2791,7 +2791,6 @@ Mike MacCana <mike.maccana@gmail.com>
 Tim Baverstock <tim.baverstock@corp.badoo.com>
 Walle Cyril <cyril.walle@protonmail.com>
 Xu Meng <dmabupt@gmail.com>
-Samuel Attard <sattard@slack-corp.com>
 Ben L. Titzer <titzer@google.com>
 Ojasvi Monga <ojasvi@Ojasvis-MacBook-Air.local>
 Shajan Jacob <shajanjp@gmail.com>