This commit is contained in:
Priler 2025-12-12 00:31:17 +05:00
parent 840e132180
commit 1a146e9505

View file

@ -6,12 +6,9 @@ use tray_icon::{
TrayIconBuilder, TrayIconEvent, TrayIconBuilder, TrayIconEvent,
}; };
use winit::event_loop::{ControlFlow, EventLoopBuilder}; use winit::event_loop::{ControlFlow, EventLoopBuilder};
<<<<<<< HEAD
=======
use image; use image;
#[cfg(target_os="windows")] #[cfg(target_os="windows")]
>>>>>>> sawixy/master
use winit::platform::windows::EventLoopBuilderExtWindows; use winit::platform::windows::EventLoopBuilderExtWindows;
use crate::config; use crate::config;