fix merge conflicts

This commit is contained in:
Francesco Pio Gaglione 2024-08-20 08:30:41 +02:00
commit 1ffb3b9870
9 changed files with 780 additions and 324 deletions

View file

@ -33,6 +33,7 @@ rayon = "1"
regex = "1"
serde = { version = "1", features = ["serde_derive"] }
shlex = { version = "1.3" }
tar = "0.4.41"
tokio = { version = "1", features = ["sync"] }
trash = { git = "https://github.com/jackpot51/trash-rs.git", branch = "delete-info" }
xdg = { version = "2.5.2", optional = true }
@ -47,6 +48,7 @@ i18n-embed-fl = "0.7"
rust-embed = "8"
slotmap = "1.0.7"
recently-used-xbel = "1.0.0"
zip = "2.1.6"
[dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic.git"