Skip to content

Commit

Permalink
fix: fixed merging issue
Browse files Browse the repository at this point in the history
  • Loading branch information
krypt0nn committed Aug 2, 2023
1 parent dc2e8e8 commit 8cccb1e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/ui/preferences/general/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use anime_launcher_sdk::anime_game_core::star_rail::consts::GameEdition;

use anime_launcher_sdk::config::ConfigExt;
use anime_launcher_sdk::star_rail::config::Config;
use anime_launcher_sdk::star_rail::config::schema::launcher::LauncherStyle;
use anime_launcher_sdk::star_rail::config::schema::launcher::{LauncherStyle, LauncherBehavior};

pub mod components;

Expand Down

0 comments on commit 8cccb1e

Please sign in to comment.