about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-07-26 08:42:15 +0000
committerbors <bors@rust-lang.org>2021-07-26 08:42:15 +0000
commitcfc856acf3112d241bd4de55ec91df5aef66c352 (patch)
treecb2abd0a4369a99a734ef8d910886c8ba7a34117
parent9cf1944217f8b0183d44a5a36eaec065f2a0b7aa (diff)
parent164b31a6b021b19416ffc7369a2770be8ea28517 (diff)
downloadrust-cfc856acf3112d241bd4de55ec91df5aef66c352.tar.gz
rust-cfc856acf3112d241bd4de55ec91df5aef66c352.zip
Auto merge of #87442 - mystor:patch-2, r=m-ou-se
Fix my email in .mailmap
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 3b8d19dc4e2..56ac5296774 100644
--- 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>