Merge oli-obk mail addresses

oli-obk · web-flow · commit b2f30e620996 · 2019-08-15T18:20:35.000+02:00
diff --git a/.mailmap b/.mailmap
@@ -181,12 +181,7 @@ Neil Pankey <npankey@gmail.com> <neil@wire.im>
 Nick Platt <platt.nicholas@gmail.com>
 Nicole Mazzuca <npmazzuca@gmail.com>
 Nif Ward <nif.ward@gmail.com>
-Oliver Schneider <oliver.schneider@kit.edu> oli-obk <github6541940@oli-obk.de>
-Oliver Schneider <oliver.schneider@kit.edu> Oliver 'ker' Schneider <rust19446194516@oli-obk.de>
-Oliver Schneider <oliver.schneider@kit.edu> Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
-Oliver Schneider <oliver.schneider@kit.edu> Oliver Schneider <git-spam9815368754983@oli-obk.de>
-Oliver Schneider <oliver.schneider@kit.edu> Oliver Schneider <github333195615777966@oli-obk.de>
-Oliver Schneider <oliver.schneider@kit.edu> Oliver Schneider <github6541940@oli-obk.de>
+Oliver Scherer <oliver.schneider@kit.edu> <github6541940@oli-obk.de> <rust19446194516@oli-obk.de> <git-spam-no-reply9815368754983@oli-obk.de> <git-spam9815368754983@oli-obk.de> <github333195615777966@oli-obk.de> <github6541940@oli-obk.de>
 Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.com>
 Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com>
 Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com>

-Original file line number
+Diff line change
 Nick Platt <[email protected]>
 Nicole Mazzuca <[email protected]>
 Nif Ward <[email protected]>
 -Oliver Schneider <[email protected]> oli-obk <[email protected]>
 -Oliver Schneider <[email protected]> Oliver 'ker' Schneider <[email protected]>
 -Oliver Schneider <[email protected]> Oliver Schneider <[email protected]>
 -Oliver Schneider <[email protected]> Oliver Schneider <[email protected]>
 -Oliver Schneider <[email protected]> Oliver Schneider <[email protected]>
 -Oliver Schneider <[email protected]> Oliver Schneider <[email protected]>
 +Oliver Scherer <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
 Ožbolt Menegatti <[email protected]> gareins <[email protected]>
 Paul Faria <[email protected]> Paul Faria <[email protected]>
 Peer Aramillo Irizar <[email protected]> parir <[email protected]>