From 2b82c50e794d8118de9291e6e04b7a2fa42bd479 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Mon, 16 Sep 2019 19:42:18 +0200
Subject: [PATCH] =?utf8?q?.mailmap:=20update=20aliases=20for=20Nicolai=20H?=
 =?utf8?q?=C3=A4hnle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1999>
---
 .mailmap | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 2566ad7ba1c..7a071bfb378 100644
--- a/.mailmap
+++ b/.mailmap
@@ -447,10 +447,10 @@ Nick Bowler <nbowler@draconx.ca>
 
 Nick Sarnie <commendsarnex@gmail.com>
 
+Nicolai Hähnle <nicolai.haehnle@amd.com>
 Nicolai Hähnle <nicolai.haehnle@amd.com> <nhaehnle@gmail.com>
-Nicolai Hähnle <nicolai.haehnle@amd.com> Nicolai Haehnle <nhaehnle@gmail.com>
-Nicolai Hähnle <nicolai.haehnle@amd.com> Nicolai Haehnle <prefect_@gmx.net>
-Nicolai Hähnle <nicolai.haehnle@amd.com> Nicolai Haehnle <prefect@upb.de>
+Nicolai Hähnle <nicolai.haehnle@amd.com> <prefect_@gmx.net>
+Nicolai Hähnle <nicolai.haehnle@amd.com> <prefect@upb.de>
 
 Nigel Stewart <nigels@users.sourceforge.net> <nigels@sourceforge.net>
 Nigel Stewart <nigels@users.sourceforge.net> <nstewart@nvidia.com>
-- 
2.30.2