fix build errors

This commit is contained in:
nexy7574 2025-05-31 21:23:39 +01:00
parent bb9e8af4e0
commit 9dbd0e654c
No known key found for this signature in database
GPG key ID: 0FA334385D0B689F
2 changed files with 2 additions and 9 deletions

View file

@ -998,12 +998,4 @@ let_underscore_future = { level = "allow", priority = 1 }
# rust doesnt understand conduwuit's custom log macros
literal_string_with_formatting_args = { level = "allow", priority = 1 }
<<<<<<< HEAD
needless_raw_string_hashes = "allow"
||||||| parent of fd972f11 (chore: Fix most clippy issue, format & typos)
=======
needless_raw_string_hashes = "allow"
>>>>>>> fd972f11 (chore: Fix most clippy issue, format & typos)

View file

@ -2,7 +2,8 @@ use askama::Template;
use percent_encoding::{NON_ALPHANUMERIC, utf8_percent_encode};
// Imports needed by askama templates.
use crate::{GIT_REMOTE_COMMIT_URL, GIT_REMOTE_WEB_URL, VERSION_EXTRA};
use crate::{GIT_REMOTE_COMMIT_URL, GIT_REMOTE_WEB_URL};
use conduwuit_build_metadata::version_tag;
mod authorize;
mod consent;