From 764af44ee28a8c83b69ec8ae724bfa1803ce926e Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 2 Jan 2018 22:57:38 +0100
Subject: [PATCH] Remove duplicate names from CREDITS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

- "Michael M." was added manually, "Schnark" came from git log - see
https://phabricator.wikimedia.org/p/Schnark/ for the connection of both
names
- same email address, already in .mailmap
 - "victorbarbu" in Ib031bef17c8a7d708a5c7878e74967d19217bbc8
 - "Victor Barbu" in I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
- same email address, added to mailmap
 - matejsuchanek in I4ef06d781bcb1aa0bc7b6d27c27cfde98390a367
 - Matěj Suchánek in Ib888634af281fc2347eaa389db4141782a98c15c

Change-Id: Ibc784dca10c9f74918daf1c3940f3cd17de1deda
---
 .mailmap | 3 ++-
 CREDITS  | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index c4f86040f3..c101be35c1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -281,6 +281,7 @@ Matthew Walker <mwalker@wikimedia.org>
 Matthias Mullie <git@mullie.eu>
 Matthias Mullie <git@mullie.eu> <mmullie@wikimedia.org>
 Matěj Grabovský <mgrabovsky@yahoo.com> <mgrabovsky@users.mediawiki.org>
+Matěj Suchánek <matejsuchanek97@gmail.com>
 Max Semenik <maxsem.wiki@gmail.com>
 Max Semenik <maxsem.wiki@gmail.com> <maxsem@users.mediawiki.org>
 Max Semenik <maxsem.wiki@gmail.com> <semenik@gmail.com>
@@ -383,7 +384,7 @@ Sam Reed <reedy@wikimedia.org> <reedy@users.mediawiki.org>
 Sam Smith <git@samsmith.io>
 Santhosh Thottingal <santhosh.thottingal@gmail.com>
 Santhosh Thottingal <santhosh.thottingal@gmail.com> <santhosh@users.mediawiki.org>
-Schnark <listenleser@gmail.com>
+Schnark (Michael M.) <listenleser@gmail.com>
 Scimonster <tehalmightyscimonster@gmail.com>
 Sean Colombo <sean.colombo@gmail.com> <sean_colombo@users.mediawiki.org>
 Sean Pringle <springle@wikimedia.org>
diff --git a/CREDITS b/CREDITS
index 6ab4ad3e14..ea011e8701 100644
--- a/CREDITS
+++ b/CREDITS
@@ -394,7 +394,6 @@ The following list can be found parsed under Special:Version/Credits -->
 * Massaf
 * Matěj Grabovský
 * Matěj Suchánek
-* matejsuchanek
 * Mathias Ertl
 * mati
 * Matt Fitzpatrick
@@ -420,7 +419,6 @@ The following list can be found parsed under Special:Version/Credits -->
 * Michael Dale
 * Michael De La Rue
 * Michael Holloway
-* Michael M.
 * Michael Newton
 * Michael Walsh
 * Michał Łazowik
@@ -573,7 +571,7 @@ The following list can be found parsed under Special:Version/Credits -->
 * Sam Wilson
 * Santhosh Thottingal
 * saptaks
-* Schnark
+* Schnark (Michael M.)
 * Scimonster
 * scnd
 * Scott Colcord
@@ -670,7 +668,6 @@ The following list can be found parsed under Special:Version/Credits -->
 * Victor Barbu
 * Victor Porton
 * Victor Vasiliev
-* victorbarbu
 * Ville Stadista
 * vishnu
 * Vitaliy Filippov
-- 
2.20.1