Skip to content

Commit a4e78a4

Browse files
committed
store: Fix semantic merge conflict
Not totally sure how this got through CI, but the most recent two PRs semantically conflicted. Update the new code to use the new glib prelude import. Signed-off-by: Colin Walters <[email protected]>
1 parent 5782980 commit a4e78a4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ostree-ext/src/container/store.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ use containers_image_proxy::{ImageProxy, OpenedImage};
2020
use flate2::Compression;
2121
use fn_error_context::context;
2222
use futures_util::TryFutureExt;
23+
use glib::prelude::*;
2324
use oci_spec::image::{
2425
self as oci_image, Arch, Descriptor, Digest, History, ImageConfiguration, ImageManifest,
2526
};
26-
use ostree::glib::FromVariant;
2727
use ostree::prelude::{Cast, FileEnumeratorExt, FileExt, ToVariant};
2828
use ostree::{gio, glib};
2929
use std::collections::{BTreeMap, BTreeSet, HashMap};

0 commit comments

Comments
 (0)