diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-15 17:14:59 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-15 17:14:59 +0100 |
| commit | 730f40eb5789efe59cf105e898297d188cd0588b (patch) | |
| tree | abf1f4b786902ee0497a92aa6b617cbf8ad1802f /src/resolve/meson.build | |
| parent | 648461c07dbe722b1298686a3b35d339a5fa5ab0 (diff) | |
| parent | 1496ceaf301835497cde6e7a74ef90f21893566c (diff) | |
| download | systemd-730f40eb5789efe59cf105e898297d188cd0588b.tar.gz | |
Merge pull request #8184 from poettering/color-ask-pw
Trivial merge conflict resolved locally.
Diffstat (limited to 'src/resolve/meson.build')
0 files changed, 0 insertions, 0 deletions