meta: consolidate email addresses for MarshallOfSound

Trott · targos · commit bb06282a9edc · 2021-09-04T15:14:49.000+02:00
PR-URL: #39651 Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git 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
@@ -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>

-Original file line number
+Diff line change
 Sam Roberts <[email protected]> <[email protected]>
 Sam Shull <[email protected]> <[email protected]>
 Sam Shull <[email protected]> <[email protected]>
 +Samuel Attard <[email protected]> <[email protected]>
 Samantha Sample <[email protected]> <=>
 Sambasiva Suda <[email protected]>
 San-Tai Hsu <[email protected]>
-Original file line number
+Diff line change
 Tim Baverstock <[email protected]>
 Walle Cyril <[email protected]>
 Xu Meng <[email protected]>
 -Samuel Attard <[email protected]>
 Ben L. Titzer <[email protected]>
 Ojasvi Monga <[email protected]>
 Shajan Jacob <[email protected]>