Merge pull request #1072 from cgwalters/fix-compilation

store: Fix semantic merge conflict
containers · Feb 4, 2025 · 5433b30 · 5433b30
2 parents 5782980 + a4e78a4
commit 5433b30
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ostree-ext/src/container/store.rs b/ostree-ext/src/container/store.rs
@@ -20,10 +20,10 @@ use containers_image_proxy::{ImageProxy, OpenedImage};
 use flate2::Compression;
 use fn_error_context::context;
 use futures_util::TryFutureExt;
+use glib::prelude::*;
 use oci_spec::image::{
     self as oci_image, Arch, Descriptor, Digest, History, ImageConfiguration, ImageManifest,
 };
-use ostree::glib::FromVariant;
 use ostree::prelude::{Cast, FileEnumeratorExt, FileExt, ToVariant};
 use ostree::{gio, glib};
 use std::collections::{BTreeMap, BTreeSet, HashMap};