From 2a3a5c35823d0e4f3ad23232aa962bacc49545bc Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 31 Jul 2021 14:51:20 -0700
Subject: [PATCH] meta: consolidate emails for timruffles
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 da4937747beb55..afd8f83d45f947 100644
--- a/.mailmap
+++ b/.mailmap
@@ -403,6 +403,7 @@ 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 Price <timprice@mangoraft.com>
+Tim Ruffles <timruffles@googlemail.com> <oi@truffles.me.uk>
 Tim Smart <timehandgod@gmail.com>
 Tim Smart <timehandgod@gmail.com> <tim@fostle.com>
 Timothy Leverett <zzzzBov@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 7180cb7cc4b65b..4aebba0525ed55 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -652,7 +652,7 @@ Ben Burns <benjamin.c.burns@gmail.com>
 Julian Duque <julianduquej@gmail.com>
 Teppei Sato <teppeis@gmail.com>
 Rudi Cilibrasi <cilibrar@morefuntechnologies.com>
-Tim Ruffles <oi@truffles.me.uk>
+Tim Ruffles <timruffles@googlemail.com>
 CGavrila <cristi_gavrila1@yahoo.com>
 Aleksey Smolenchuk <aleksey@uber.com>
 Caitlin Potter <caitpotter88@gmail.com>
@@ -2270,7 +2270,6 @@ prayag21 <10997858+prayag21@users.noreply.github.com>
 Bruno Pinho <bpinhosilva@gmail.com>
 Anto Aravinth <anto.aravinth.cse@gmail.com>
 Helio Frota <00hf11@gmail.com>
-Tim Ruffles <timruffles@googlemail.com>
 Jacob Page <jpage@godaddy.com>
 sagulati <sagulati@adobe.com>
 conectado <gabrielalejandro7@gmail.com>