diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:38:51 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:38:51 -0500 |
| commit | b6d071f1df46eb841ba3f88cdb2b248eaf5f35f8 (patch) | |
| tree | e9136a6d96322d8c8fe52a4a234275d368be36eb /src/journal/journal-file.c | |
| parent | 3f0ba0278cd61b2d3bb01abc744d98a6ba3d7730 (diff) | |
| parent | 0064dcc0fc1c6519d54c5a104990c1db94f19ddf (diff) | |
Merge commit '0064dcc0fc1c6519d54c5a104990c1db94f19ddf' into notsystemd/premove
# Conflicts:
# system-preset/90-systemd.preset
Diffstat (limited to 'src/journal/journal-file.c')
0 files changed, 0 insertions, 0 deletions