Merge pull request #2812 from tintou/tintou/g-ir-fix

author Colin Walters <walters@verbum.org>

Fri, 17 Mar 2023 15:36:22 +0000 (11:36 -0400)

committer GitHub <noreply@github.com>

Fri, 17 Mar 2023 15:36:22 +0000 (11:36 -0400)
author Colin Walters <walters@verbum.org>
Fri, 17 Mar 2023 15:36:22 +0000 (11:36 -0400)
committer GitHub <noreply@github.com>
Fri, 17 Mar 2023 15:36:22 +0000 (11:36 -0400)
diff --cc Makefile-libostree.am
Simple merge
diff --cc configure.ac
Simple merge
author	Colin Walters <walters@verbum.org>
	Fri, 17 Mar 2023 15:36:22 +0000 (11:36 -0400)
committer	GitHub <noreply@github.com>
	Fri, 17 Mar 2023 15:36:22 +0000 (11:36 -0400)
		1	2
Makefile-libostree.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history