From c5b6ccf992ddce218990e11c925e856425c54a24 Mon Sep 17 00:00:00 2001 From: quexeky Date: Mon, 4 Nov 2024 19:05:27 +1100 Subject: [PATCH] Fixed all merge issues Signed-off-by: quexeky --- src-tauri/src/auth.rs | 1 + src-tauri/src/library.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/src-tauri/src/auth.rs b/src-tauri/src/auth.rs index ad0b241..f128a4f 100644 --- a/src-tauri/src/auth.rs +++ b/src-tauri/src/auth.rs @@ -12,6 +12,7 @@ use url::{ParseError, Url}; use crate::{ db::{DatabaseAuth, DatabaseImpls}, + remote::RemoteAccessError, AppState, AppStatus, User, DB, }; diff --git a/src-tauri/src/library.rs b/src-tauri/src/library.rs index a63973d..80e4134 100644 --- a/src-tauri/src/library.rs +++ b/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)]