Fixed all merge issues

Signed-off-by: quexeky <git@quexeky.dev>

src-tauri/src/auth.rs

@@ -12,6 +12,7 @@ use url::{ParseError, Url};
 
 use crate::{
     db::{DatabaseAuth, DatabaseImpls},
+    remote::RemoteAccessError,
     AppState, AppStatus, User, DB,
 };
 

src-tauri/src/library.rs

@@ -6,6 +6,7 @@ use tauri::{AppHandle, Manager};
 
 use crate::db::DatabaseGameStatus;
 use crate::db::DatabaseImpls;
+use crate::remote::RemoteAccessError;
 use crate::{auth::generate_authorization_header, AppState, DB};
 
 #[derive(serde::Serialize)]