Merge pull request #35723 from lilyball/forgot-about-this-mailmap

CodaFi · web-flow · commit 2cfa57d33965 · 2021-02-03T09:16:43.000-08:00
Update mailmap
diff --git a/.mailmap b/.mailmap
@@ -84,12 +84,13 @@ John Regner <john@johnregner.com> <regnerjr@gmail.com>
 Karoy Lorentey <klorentey@apple.com> <karoly@lorentey.hu>
 Kavon Farvardin <kfarvardin@apple.com> <kavon@farvard.in>
 Keith Smiley <k@keith.so> <keithbsmiley@gmail.com>
-Kevin Ballard <kevin@sb.org> <kevin.ballard@postmates.com>
 Kevin Saldaña <ksaldana1@gmail.com>
 Kim Topley <ktopley@apple.com>
 Kosuke Ogawa <ogawa_kousuke@aratana.jp> <koogawa.app@gmail.com>
 Kuba Mracek <mracek@apple.com> <jbrecka@apple.com>
 Kuba Mracek <mracek@apple.com>
+Lily Ballard <lily@sb.org> <kevin.ballard@postmates.com>
+Lily Ballard <lily@sb.org> <kevin@sb.org>
 Luiz Fernando Silva <luizinho_mack@yahoo.com.br>
 Luqman Aden <luqman@apple.com> <luqman_aden@apple.com>
 Marcelo Fabri <me@marcelofabri.com> <marcelofabri@users.noreply.github.com>

-Original file line number
+Diff line change
 Karoy Lorentey <[email protected]> <[email protected]>
 Kavon Farvardin <[email protected]> <[email protected]>
 Keith Smiley <[email protected]> <[email protected]>
 -Kevin Ballard <[email protected]> <[email protected]>
 Kevin Saldaña <[email protected]>
 Kim Topley <[email protected]>
 Kosuke Ogawa <[email protected]> <[email protected]>
 Kuba Mracek <[email protected]> <[email protected]>
 Kuba Mracek <[email protected]>
 +Lily Ballard <[email protected]> <[email protected]>
 +Lily Ballard <[email protected]> <[email protected]>
 Luiz Fernando Silva <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
 Marcelo Fabri <[email protected]> <[email protected]>