Skip to content

Commit

Permalink
Resolving merge conflicts with github web sucks..
Browse files Browse the repository at this point in the history
  • Loading branch information
Radiicall committed Feb 22, 2024
1 parent c29c007 commit 1b41ee9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 20 deletions.
22 changes: 3 additions & 19 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 jellyfin-rpc-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ colored = "2.0"
retry = "2.0"

[dependencies.jellyfin-rpc]
features = ["imgur", "cli"]
features = ["imgur"]
#version = "1.0.0"
path = "../jellyfin-rpc"

Expand Down

0 comments on commit 1b41ee9

Please sign in to comment.