Merge pull request #2313 from DaanDeMeyer/resources

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

Tue, 23 Jan 2024 10:49:45 +0000 (11:49 +0100)

committer GitHub <noreply@github.com>

Tue, 23 Jan 2024 10:49:45 +0000 (11:49 +0100)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Tue, 23 Jan 2024 10:49:45 +0000 (11:49 +0100)
committer GitHub <noreply@github.com>
Tue, 23 Jan 2024 10:49:45 +0000 (11:49 +0100)
diff --cc mkosi/__init__.py
Simple merge
diff --cc mkosi/config.py
Simple merge
diff --cc mkosi/run.py
Simple merge
diff --cc mkosi/util.py
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Tue, 23 Jan 2024 10:49:45 +0000 (11:49 +0100)
committer	GitHub <noreply@github.com>
	Tue, 23 Jan 2024 10:49:45 +0000 (11:49 +0100)
		1	2
mkosi/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi/run.py	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi/util.py	patch \|	diff1 \|	diff2 \|	blob \| history