From cdcba9b18bbd8d61f688e66a2ce78ce0d0d7961a Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 9 Oct 2021 14:58:11 -0700
Subject: [PATCH] meta: consolidate duplicate AUTHORS entries for hassaanp

Create a .mailmap entry to consolidate the two AUTHORS entries for
hassaanp into a single entry.
---
 .mailmap | 1 +
 AUTHORS  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 8e4bcaf384a269..6aab718da9108d 100644
--- 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
index 2d420bdafd2be4..56e8e459cc3819 100644
--- 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>