Merge pull request #1946 from dbnicholson/ostree-metadata-api

author Colin Walters <walters@verbum.org>

Thu, 9 Feb 2023 13:24:58 +0000 (08:24 -0500)

committer GitHub <noreply@github.com>

Thu, 9 Feb 2023 13:24:58 +0000 (08:24 -0500)
author Colin Walters <walters@verbum.org>
Thu, 9 Feb 2023 13:24:58 +0000 (08:24 -0500)
committer GitHub <noreply@github.com>
Thu, 9 Feb 2023 13:24:58 +0000 (08:24 -0500)
diff --cc src/ostree/ot-builtin-prune.c
Simple merge
diff --cc src/ostree/ot-builtin-summary.c
Simple merge
author	Colin Walters <walters@verbum.org>
	Thu, 9 Feb 2023 13:24:58 +0000 (08:24 -0500)
committer	GitHub <noreply@github.com>
	Thu, 9 Feb 2023 13:24:58 +0000 (08:24 -0500)
		1	2
src/ostree/ot-builtin-prune.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/ostree/ot-builtin-summary.c	patch \|	diff1 \|	diff2 \|	blob \| history