meta: consolidate AUTHORS entries for samshull

Trott · danielleadams · commit fc2a6263574f · 2021-08-16T16:35:20.000-04:00
PR-URL: #39705 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git 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
@@ -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>

-Original file line number
+Diff line change
 Sam P Gallagher-Bishop <[email protected]> <[email protected]>
 Sam Roberts <[email protected]> <[email protected]>
 Sam Shull <[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]> <=>
-Original file line number
+Diff line change
 Chris Henney <[email protected]>
 Yojan Shrestha <[email protected]>
 Rodrigo Palma <[email protected]>
 -Sam Shull <[email protected]>
 Michael-Bryant Choa <[email protected]>
 CodeVana <[email protected]>
 Daniel Sims <[email protected]>