meta: consolidate duplicate AUTHORS entries for hassaanp

Trott · targos · commit 93cecb470081 · 2021-10-13T10:20:56.000+02:00
Create a .mailmap entry to consolidate the two AUTHORS entries for hassaanp into a single entry. PR-URL: #40391 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>
diff --git a/.mailmap b/.mailmap
@@ -165,6 +165,7 @@ Guy Bedford <guybedford@gmail.com>
 Halil İbrahim Şener <hisener@yahoo.com>
 Hannah Kim <h.heeeun.kim@gmail.com>
 Hannes Magnusson <hannes.magnusson@gmail.com> <hannes.magnusson@creditkarma.com>
+Hassaan Pasha <pasha.hassaan@gmail.com> <hassaan.pasha@teamo.io>
 Hendrik Schwalm <mail@hendrikschwalm.de>
 Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
diff --git a/AUTHORS b/AUTHORS
@@ -2995,7 +2995,7 @@ ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
 Mateusz Krawczuk <krawczukmat@gmail.com>
 Jonathan MERCIER <jmercier@cng.fr>
 Jichan <development@jc-lab.net>
-Hassaan Pasha <hassaan.pasha@teamo.io>
+Hassaan Pasha <pasha.hassaan@gmail.com>
 Eric Dobbertin <eric@dairystatedesigns.com>
 Victor <doc999tor@gmail.com>
 Ling Samuel <lingsamuelgrace@gmail.com>
@@ -3224,7 +3224,6 @@ simov <simeonvelichkov@gmail.com>
 wwwzbwcom <zbwhome@outlook.com>
 David Glasser <glasser@davidglasser.net>
 pezhmanparsaee <p.parsaee@gmail.com>
-Hassaan Pasha <pasha.hassaan@gmail.com>
 Darkripper214 <phakorn214@gmail.com>
 Anu Pasumarthy <anupama.pasumarthy@gmail.com>
 HiroyukiYagihashi <hey@hiroy.uk>

-Original file line number
+Diff line change
 Halil İbrahim Şener <[email protected]>
 Hannah Kim <[email protected]>
 Hannes Magnusson <[email protected]> <[email protected]>
 +Hassaan Pasha <[email protected]> <[email protected]>
 Hendrik Schwalm <[email protected]>
 Henry Chin <[email protected]>
 Herbert Vojčík <[email protected]>
-Original file line number
+Diff line change
 Mateusz Krawczuk <[email protected]>
 Jonathan MERCIER <[email protected]>
 Jichan <[email protected]>
 -Hassaan Pasha <hassaan.pasha@teamo.io>
 +Hassaan Pasha <pasha[email protected]>
 Eric Dobbertin <[email protected]>
 Victor <[email protected]>
 Ling Samuel <[email protected]>
 wwwzbwcom <[email protected]>
 David Glasser <[email protected]>
 pezhmanparsaee <[email protected]>
 -Hassaan Pasha <[email protected]>
 Darkripper214 <[email protected]>
 Anu Pasumarthy <[email protected]>
 HiroyukiYagihashi <[email protected]>