From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 8 Nov 2019 09:18:46 +0000 (+0100)
Subject: Merge pull request #13962 from keszybz/man-ordering
X-Git-Tag: v244-rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5c30300dad5f88d152b401fef4de432e6dc7ea1;p=thirdparty%2Fsystemd.git

Merge pull request #13962 from keszybz/man-ordering

Describe ordering in case of Conflicts=
---

d5c30300dad5f88d152b401fef4de432e6dc7ea1