Merge pull request #13011 from keszybz/auto-erase

author Lennart Poettering <lennart@poettering.net>

Wed, 10 Jul 2019 23:05:01 +0000 (01:05 +0200)

committer GitHub <noreply@github.com>

Wed, 10 Jul 2019 23:05:01 +0000 (01:05 +0200)
author Lennart Poettering <lennart@poettering.net>
Wed, 10 Jul 2019 23:05:01 +0000 (01:05 +0200)
committer GitHub <noreply@github.com>
Wed, 10 Jul 2019 23:05:01 +0000 (01:05 +0200)
diff --cc TODO
Simple merge
diff --cc src/journal/journalctl.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 10 Jul 2019 23:05:01 +0000 (01:05 +0200)
committer	GitHub <noreply@github.com>
	Wed, 10 Jul 2019 23:05:01 +0000 (01:05 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/journal/journalctl.c	patch \|	diff1 \|	diff2 \|	blob \| history