Bruh
This commit is contained in:
parent
e3b3a3ab9c
commit
b2fcc900dd
1 changed files with 0 additions and 3 deletions
|
|
@ -6,12 +6,9 @@ use tray_icon::{
|
|||
TrayIconBuilder, TrayIconEvent,
|
||||
};
|
||||
use winit::event_loop::{ControlFlow, EventLoopBuilder};
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
use image;
|
||||
|
||||
#[cfg(target_os="windows")]
|
||||
>>>>>>> sawixy/master
|
||||
use winit::platform::windows::EventLoopBuilderExtWindows;
|
||||
|
||||
use crate::config;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue