From 9dbd0e654c28e3d0fe2af1ed5741380aef5096e2 Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Sat, 31 May 2025 21:23:39 +0100
Subject: [PATCH] fix build errors

---
 Cargo.toml      | 8 --------
 src/web/oidc.rs | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c73520ea..b4eb0a8c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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)
diff --git a/src/web/oidc.rs b/src/web/oidc.rs
index 080f482e..1abe6f83 100644
--- a/src/web/oidc.rs
+++ b/src/web/oidc.rs
@@ -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;