From aa12b3cc9d329b635242569aaf4453b86f6578e1 Mon Sep 17 00:00:00 2001
From: Alexandre Almeida <wilsalx@gmail.com>
Date: Fri, 28 May 2021 09:02:57 -0300
Subject: [PATCH] Fix CONTRIBUTORS and .mailmap (#6033)

* CONTRIBUTORS: remove duplicates

* Remove ancient address from .mailmap
---
 .mailmap         | 2 +-
 doc/CONTRIBUTORS | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 14d4754ce..536bc692c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,4 @@
-Alexandre Almeida <wilsalx@gmail.com> <meta.lx@hotmail.com>
+Alexandre Almeida <wilsalx@gmail.com>
 Tobias Junghans <tobias.doerffel@gmail.com>
 Dave French <dave.french3@googlemail.com>
 Paul Giblock <drfaygo@gmail.com> <pgib@users.sf.net>
diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
index eb030ad71..c58072c24 100644
--- a/doc/CONTRIBUTORS
+++ b/doc/CONTRIBUTORS
@@ -15,7 +15,7 @@ Michael Gregorius <michael.gregorius.git@arcor.de>
 grejppi <grejppi@gmail.com>
 Javier Serrano Polo <javier@jasp.net>
 Wong Cho Ching <chwong249664@yahoo.com>
-Alexandre Almeida <wilsalx@gmail.com>
+Alexandre Almeida (M374LX) <wilsalx@gmail.com>
 Daniel Winzen <d@winzen4.de>
 LMMS Service Account <lmms.service@gmail.com>
 Steffen Baranowsky <BaraMGB@freenet.de>
@@ -31,7 +31,6 @@ Andreas Brandmaier <andy@brandmaier.de>
 Fastigium <fastigiummusic@gmail.com>
 Amadeus Folego <amadeusfolego@gmail.com>
 Jonas Trappenberg <jonas@trappenberg.ch>
-M374LX <wilsalx@gmail.com>
 DomClark <mrdomclark@gmail.com>
 grindhold <grindhold@gmx.net>
 Mike Choi <rdavidian71@gmail.com>
@@ -58,7 +57,6 @@ mikobuntu <chrissy.mc.1@hotmail.co.uk>
 Andrés <andresbb@gmail.com>
 Matthew Krafczyk <krafczyk.matthew@gmail.com>
 mohamed <mohamed@amaksoud.com>
-Alexandre <wilson@wil-pc>
 RebeccaDeField <rebeccadefield@gmail.com>
 Yann Collette <ycollette.nospam@free.fr>
 Aya Morisawa <AyaMorisawa4869@gmail.com>