Skip to content

Commit

Permalink
Merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
hiirrxnn committed Jan 11, 2024
1 parent 4ec6e3b commit 61fd616
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,6 @@ tokio = { version = "1", features = ["macros"] }
typed-builder = "^0.18"
url = "2"
urlencoding = "2"
uuid = "1.6.1"
uuid = "1.6.1"

tera = "1"

0 comments on commit 61fd616

Please sign in to comment.