fix: fixed merge issues

This commit is contained in:
Observer KRypt0n_ 2023-05-06 15:27:56 +02:00
parent 1d7d50e85c
commit 8007270f48
No known key found for this signature in database
GPG key ID: 844DA47BA25FE1E2
3 changed files with 4 additions and 4 deletions

4
Cargo.lock generated
View file

@ -65,8 +65,8 @@ dependencies = [
[[package]] [[package]]
name = "anime-launcher-sdk" name = "anime-launcher-sdk"
version = "1.2.1" version = "1.2.2"
source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.2.1#f7bddd1d2fde4dcc7d04bda9e4d9160a5bc88218" source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.2.2#f2efb2c8bf339e065ecafc53cfcc9c02a129124e"
dependencies = [ dependencies = [
"anime-game-core", "anime-game-core",
"anyhow", "anyhow",

View file

@ -17,7 +17,7 @@ glib-build-tools = "0.17"
[dependencies.anime-launcher-sdk] [dependencies.anime-launcher-sdk]
git = "https://github.com/an-anime-team/anime-launcher-sdk" git = "https://github.com/an-anime-team/anime-launcher-sdk"
tag = "1.2.1" tag = "1.2.2"
features = ["all", "star-rail"] features = ["all", "star-rail"]
# path = "../anime-launcher-sdk" # ! for dev purposes only # path = "../anime-launcher-sdk" # ! for dev purposes only

View file

@ -5,7 +5,7 @@ use relm4::factory::*;
use adw::prelude::*; use adw::prelude::*;
use anime_launcher_sdk::sessions::SessionsExt; use anime_launcher_sdk::sessions::SessionsExt;
use anime_launcher_sdk::genshin::sessions::Sessions; use anime_launcher_sdk::star_rail::sessions::Sessions;
use super::main::PreferencesAppMsg; use super::main::PreferencesAppMsg;