From d87fcf99593cbefe2bc08e9b13cf052a605ab82a Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 31 Jul 2021 14:53:00 -0700
Subject: [PATCH] meta: consolidate emails for timcosta
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/39611
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 .mailmap | 1 +
 AUTHORS  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index afd8f83d45f947..51918b77b62b6b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -402,6 +402,7 @@ Thomas Watson <w@tson.dk>
 Tierney Cyren <hello@bnb.im>
 Tierney Cyren <hello@bnb.im> &! (bitandbang) <tieliaco@gmail.com>
 Tim Caswell <tim@creationix.com> <tim@0-26-8-e9-4c-e1.dyn.utdallas.edu>
+Tim Costa <tim@timcosta.io> <tjsail33@gmail.com>
 Tim Price <timprice@mangoraft.com>
 Tim Ruffles <timruffles@googlemail.com> <oi@truffles.me.uk>
 Tim Smart <timehandgod@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 4aebba0525ed55..7e786dddde3600 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1664,7 +1664,7 @@ Miguel Martins <mmartins@uphold.com>
 Yury Popov <github@phoenix.dj>
 George Bezerra <georgelione@gmail.com>
 Benjamin Coe <bencoe@gmail.com>
-Tim Costa <tjsail33@gmail.com>
+Tim Costa <tim@timcosta.io>
 Rahul Mishra <mishra.rahul1712@gmail.com>
 Damien O'Reilly <damienreilly@gmail.com>
 Tuan Anh Tran <me@tuananh.org>
@@ -2957,7 +2957,6 @@ Rosen Penev <rosenp@gmail.com>
 Jeremy Albright <myrlin1@gmail.com>
 Giovanni Campagna <gcampagn@cs.stanford.edu>
 Donggeon Lim <ooqwe486@gmail.com>
-Tim Costa <tim@timcosta.io>
 rene.herrmann <rene.herrmann@share-now.com>
 Derek Lewis <DerekNonGeneric@inf.is>
 Kirill Ponomarev <shacaron@gmail.com>