From 6543f31928052d6c96b6a71c77e1027e99bed617 Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Wed, 26 May 2021 12:59:39 +0000 Subject: [PATCH] Merge branch 'fix/change-lastnames' into 'master' [mailmap][license] Update Theresas lastname in mailmap and license See merge request dumux-repositories/dumux!2642 (cherry picked from commit a48031e07e187c89ea4834c343a977f127f439d7) 1dc0fc5a [doc][license] update theresas lastname in mailmap and license --- .mailmap | 9 +++++---- LICENSE.md | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.mailmap b/.mailmap index 051908f494..5ab2085147 100644 --- a/.mailmap +++ b/.mailmap @@ -80,13 +80,14 @@ Samuel Scherrer <samuel.scherrer@iws.uni-stuttgart.de> <samuel.scherrer@posteo.d Shirin Moradi <s.moradi@fz-juelich.de> <moradi@darth.iws.uni-stuttgart.de> -Simon Emmert <simon.emmert@iws.uni-stuttgart.de> <scholz.simon@web.de> -Simon Emmert <simon.emmert@iws.uni-stuttgart.de> <simon.scholz@iws.uni-stuttgart.de> +Simon Emmert <simon.emmert@iws.uni-stuttgart.de> Simon Scholz <scholz.simon@web.de> +Simon Emmert <simon.emmert@iws.uni-stuttgart.de> Simon Scholz <simon.scholz@iws.uni-stuttgart.de> Sina Ackermann <Sina.Ackermann@gmx.de> <sina.ackermann@iws.uni-stuttgart.de> -Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> <tkurz@kiddo.iws.uni-stuttgart.de> -Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> tkurz <theresa.kurz@iws.uni-stuttgart.de> +Theresa Schollenberger <theresa.schollenberger@iws.uni-stuttgart.de> Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> +Theresa Schollenberger <theresa.schollenberger@iws.uni-stuttgart.de> Theresa Kurz <tkurz@kiddo.iws.uni-stuttgart.de> +Theresa Schollenberger <theresa.schollenberger@iws.uni-stuttgart.de> tkurz <theresa.kurz@iws.uni-stuttgart.de> Vishal Jambhekar <vishal.jambhekar@iws.uni-stuttgart.de> diff --git a/LICENSE.md b/LICENSE.md index f79cb115ec..cb7f092898 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -38,7 +38,7 @@ Copyright holders | 2020-2021 | Tim Jupe | | 2020-2021 | Mathis Kelm | | 2017 | Kata Kurgyis | -| 2018-2021 | Theresa Kurz | +| 2018-2021 | Theresa Schollenberger | | 2008-2012 | Andreas Lauser | | 2018 | Giuliano Lombardo | | 2018-2021 | Melanie Lipp | -- GitLab