From 6a771f8bcb285100a5d5865c4cf75325bb0ec56c Mon Sep 17 00:00:00 2001 From: Rich Trott <rtrott@gmail.com> Date: Tue, 19 Oct 2021 06:07:35 -0700 Subject: [PATCH] meta: consolidate AUTHORS entries for dguo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/40517 Reviewed-By: Tobias Nießen <tniessen@tnie.de> 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 6e2e441d082adb..4ddfa587f59f79 100644 --- a/.mailmap +++ b/.mailmap @@ -102,6 +102,7 @@ Daniel Pihlström <sciolist.se@gmail.com> Daniel Wang <wangyang0123@gmail.com> Daniel Wang <wangyang0123@gmail.com> <wangyang02@baidu.com> Danielle Adams <adamzdanielle@gmail.com> <danielle.adams@heroku.com> +Danny Guo <danny@dannyguo.com> <dannyguo91@gmail.com> Danny Nemer <hi@dannynemer.com> <DannyNemer@users.noreply.github.com> Danny Nemer <hi@dannynemer.com> <hi@DannyNemer.com> Dave Olszewski <cxreg@pobox.com> <daveo@nodesource.com> diff --git a/AUTHORS b/AUTHORS index d00474acb51866..ca6f9011e8d2f9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1084,7 +1084,7 @@ Rachel <rachel.black@flashtalking.com> Jason Ginchereau <jasongin@microsoft.com> Paul Kiddie <paul@paulkiddie.com> scott stern <scott.stern06@gmail.com> -Danny Guo <dannyguo91@gmail.com> +Danny Guo <danny@dannyguo.com> lrlna <shestak.irina@gmail.com> Matt Lang <matt@mediasuite.co.nz> Thomas van Lankveld <thomas@cell-0.com> @@ -3091,7 +3091,6 @@ Frank Lemanschik <frank@github.dspeed.eu> Justice Almanzar <superdash993@gmail.com> Maksim Sinik <maksim@sinik.it> João Lucas Lucchetta <joao.lucas.lucchetta@gmail.com> -Danny Guo <danny@dannyguo.com> Turner Jabbour <doubleujabbour@gmail.com> Igor Mikhalev <mr.igor.mikhalev@gmail.com> DeeDeeG <DeeDeeG@users.noreply.github.com>