man: describe ordering in case of Conflicts=

[thirdparty/systemd.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 4764ad670af9f3cdba13ac584653d712d6a53d1c..28b60946ac0f79feb73644a7ef899280b05b85b2 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -191,6 +191,7 @@ Yann E. Morin <yann.morin.1998@free.fr>
 Yin Kangkai <kangkai.yin@intel.com> <kangkai.yin@linux.intel.com>
 Zachary Winnerman <33329648+winnerman-pythian@users.noreply.github.com>
 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> <you@example.com>
 Łukasz Stelmach <l.stelmach@samsung.com> <stlman@poczta.fm>
 Jonathon Kowalski <bl0pbl33p@gmail.com>
 Diego Canuhe <dcanuhe@gmail.com> <46734128+dcanuhe@users.noreply.github.com>