From a56984a51e6766975213bdfc77c685cc43e1088d Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 30 Jul 2021 20:53:20 -0700 Subject: [PATCH] meta: add mailmap entry for ryzokuken This consolidates two email addresses/entries in AUTHORS into one. --- .mailmap | 1 + AUTHORS | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index b5d52102d97389..7d699110739b9d 100644 --- a/.mailmap +++ b/.mailmap @@ -429,6 +429,7 @@ Trivikram Kamat <16024985+trivikr@users.noreply.github.c ttzztztz Tyler Larson Ujjwal Sharma +Ujjwal Sharma Uttam Pawar Viktor Karpov Vincent Voyer diff --git a/AUTHORS b/AUTHORS index 2bedb34ddc119a..87eb1bf67b91a1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3017,7 +3017,6 @@ Joe Pea ExE Boss <3889017+ExE-Boss@users.noreply.github.com> Mateusz Krawczuk Jonathan MERCIER -Ujjwal Sharma Jichan Hassaan Pasha Eric Dobbertin