summaryrefslogtreecommitdiff
path: root/src/core/org.freedesktop.systemd1.policy.in.in
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-02-15 17:14:59 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-02-15 17:14:59 +0100
commit730f40eb5789efe59cf105e898297d188cd0588b (patch)
treeabf1f4b786902ee0497a92aa6b617cbf8ad1802f /src/core/org.freedesktop.systemd1.policy.in.in
parent648461c07dbe722b1298686a3b35d339a5fa5ab0 (diff)
parent1496ceaf301835497cde6e7a74ef90f21893566c (diff)
downloadsystemd-730f40eb5789efe59cf105e898297d188cd0588b.tar.gz
Merge pull request #8184 from poettering/color-ask-pw
Trivial merge conflict resolved locally.
Diffstat (limited to 'src/core/org.freedesktop.systemd1.policy.in.in')
0 files changed, 0 insertions, 0 deletions