From 829e85b4ead338268ad259cddcdf06a72854c194 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 27 Jul 2021 22:08:47 -0700 Subject: [PATCH] meta: add .mailmap entry to remove duplication in AUTHORS --- .mailmap | 2 ++ AUTHORS | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index a7a36916790903..d6f2f6350914d1 100644 --- a/.mailmap +++ b/.mailmap @@ -321,6 +321,8 @@ Reza Akhavan Ricardo Sánchez Gregorio Richard Lau Rick Olson +rickyes <0x19951125@gmail.com> +rickyes <0x19951125@gmail.com> Rob Adelmann Rob Adelmann Robert Nagy Robert Nagy diff --git a/AUTHORS b/AUTHORS index fb27f493b7a252..9c2afc726e14a9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2846,7 +2846,7 @@ Javier Ledezma Marian Rusnak <4215517+marian-r@users.noreply.github.com> Jenia Anton Gerasimov -rickyes +rickyes <0x19951125@gmail.com> Simon A. Eugster TATSUNO Yasuhiro Robert Jensen @@ -3083,7 +3083,6 @@ Ben Bucksch Eli Schwartz Maciej Kacper Jagiełło Tom Nagle -rickyes sapics Sagar Jadhav Dennis Ameling @@ -3178,7 +3177,6 @@ Mattias Runge-Broberg Szymon Marczak <36894700+szmarczak@users.noreply.github.com> Dmitry Semigradsky Ole André Vadla Ravnås -rickyes <0x19951125@gmail.com> Aleksandr Krutko Brian Ingenito <28159742+bingenito@users.noreply.github.com> FeelyChau