Merge pull request #2553 from behrmann/jsonkeys

author Daan De Meyer <daan.j.demeyer@gmail.com>

Tue, 26 Mar 2024 23:02:03 +0000 (00:02 +0100)

committer GitHub <noreply@github.com>

Tue, 26 Mar 2024 23:02:03 +0000 (00:02 +0100)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Tue, 26 Mar 2024 23:02:03 +0000 (00:02 +0100)
committer GitHub <noreply@github.com>
Tue, 26 Mar 2024 23:02:03 +0000 (00:02 +0100)
diff --cc mkosi/config.py
Simple merge
diff --cc tests/test_json.py
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Tue, 26 Mar 2024 23:02:03 +0000 (00:02 +0100)
committer	GitHub <noreply@github.com>
	Tue, 26 Mar 2024 23:02:03 +0000 (00:02 +0100)
		1	2
mkosi/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_json.py	patch \|	diff1 \|	diff2 \|	blob \| history