Auto merge of #87442 - mystor:patch-2, r=m-ou-se

bors · bors · commit cfc856acf311 · 2021-07-26T08:42:15.000Z
Fix my email in .mailmap
diff --git a/.mailmap b/.mailmap
@@ -216,7 +216,7 @@ Neil Pankey <npankey@gmail.com> <neil@wire.im>
 Nick Platt <platt.nicholas@gmail.com>
 Nicole Mazzuca <npmazzuca@gmail.com>
 Nif Ward <nif.ward@gmail.com>
-Nika Layzell <michael@thelayzells.com>
+Nika Layzell <nika@thelayzells.com> <michael@thelayzells.com>
 Oliver Middleton <olliemail27@gmail.com> <ollie27@users.noreply.github.com>
 Oliver Scherer <oliver.schneider@kit.edu> <git-spam-no-reply9815368754983@oli-obk.de>
 Oliver Scherer <oliver.schneider@kit.edu> <git-spam9815368754983@oli-obk.de>

-Original file line number
+Diff line change
 Nick Platt <[email protected]>
 Nicole Mazzuca <[email protected]>
 Nif Ward <[email protected]>
 -Nika Layzell <[email protected]>
 +Nika Layzell <[email protected]> <[email protected]>
 Oliver Middleton <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>