From 75f5fc3435b241c02417856d5b23e195bc1bbf36 Mon Sep 17 00:00:00 2001
From: Andres Gomez <agomez@igalia.com>
Date: Tue, 2 Feb 2021 21:49:20 +0200
Subject: [PATCH] .mailmap: resolve duplicates for Emmanuel Vadot

Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 791ef43..c3bbf43 100644
--- a/.mailmap
+++ b/.mailmap
@@ -209,6 +209,8 @@ Emil Velikov <emil.l.velikov@gmail.com> <emmil.velikov@collabora.com>
 
 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> <emmanuel.peyrot@collabora.com>
 
+Emmanuel Vadot <manu@FreeBSD.org> Emmanuel <manu@FreeBSD.org>
+
 Eric Anholt <eric@anholt.net> Eric Anholt <anholt@FreeBSD.org>
 
 Eric Engestrom <eric@engestrom.ch> <eric.engestrom@imgtec.com>
-- 
2.7.4