Merge branch 'timok-master-patch-11172' into 'master'

Fix .mailmap tk See merge request !3855

Merge branch 'timok-master-patch-11172' into 'master'
Fix .mailmap tk See merge request !3855
52d66e0e · Timo Koch · 3356388f · a46cddef · 52d66e0e
Commit 52d66e0e authored 6 months ago by Timo Koch
--- a/.mailmap
+++ b/.mailmap
@@ -95,4 +95,4 @@ Theresa Schollenberger <theresa.schollenberger@iws.uni-stuttgart.de> tkurz <ther
 Vishal Jambhekar <vishal.jambhekar@iws.uni-stuttgart.de>

 Timo Koch <timokoch@uio.no> <timo.koch@iws.uni-stuttgart.de>
-Timo Koch <timokoch@math.uio.no> <timo.koch@iws.uni-stuttgart.de>
+Timo Koch <timokoch@uio.no> <timokoch@math.uio.no>