diff options
author | Michael Boelen <michael.boelen@cisofy.com> | 2020-10-02 12:05:04 +0300 |
---|---|---|
committer | Michael Boelen <michael.boelen@cisofy.com> | 2020-10-02 12:05:04 +0300 |
commit | c6bd185fd7321c6ae84263dbed6a320dc70f1225 (patch) | |
tree | df9b48ce1eb6b5677efb578f77ba8d9bc4281864 /lynis | |
parent | 11be8b03ae5c2e79625e6c6af1ca3c773f478132 (diff) | |
parent | 7df0b8618b5cce39961b245a3c582af4294276d7 (diff) |
Resolved merge conflict
Diffstat (limited to 'lynis')
0 files changed, 0 insertions, 0 deletions