From 88c91a5d1a4418f065f6a606d4ff88f2e4bbba1a Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 12 Oct 2021 11:26:53 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for evantorrie

Add a .mailmap entry for evantorrie to consolidate their two AUTHORS
entries into one.
---
 .mailmap | 1 +
 AUTHORS  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index ea3fae1ae350f9..8a3d2aa6cc210d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -132,6 +132,7 @@ EungJun Yi <semtlenori@gmail.com>
 Evan Larkin <evan.larkin.il.com> <evan.larkin.iit@gmail.com>
 Evan Lucas <evanlucas@me.com> <evan.lucas@help.com>
 Evan Lucas <evanlucas@me.com> <evan@btc.com>
+Evan Torrie <evan.torrie@yahoo.com> <evant@yahoo-inc.com>
 FangDun Cai <cfddream@gmail.com>
 Fangshi He <hefangshi@gmail.com>
 Farid Neshat <FaridN_SOAD@yahoo.com>
diff --git a/AUTHORS b/AUTHORS
index 98d3796f357e9d..892ed5cb90b13c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1332,7 +1332,6 @@ Benedikt Meurer <bmeurer@google.com>
 Kai Cataldo <kaicataldo@gmail.com>
 Victor Felder <victor@draft.li>
 Yann Pringault <yann@cinq-s.com>
-Evan Torrie <evant@yahoo-inc.com>
 Michael Lefkowitz <lefkowitz.michael@gmail.com>
 Viktor Karpov <viktor.s.karpov@gmail.com>
 Lukasz Gasior <lukasz@gasior.net.pl>