Fix the examples
This commit is contained in:
parent
86bafdc104
commit
dcd9ddde50
3 changed files with 18 additions and 34 deletions
|
|
@ -2,15 +2,7 @@
|
|||
fn main() {
|
||||
extern crate env_logger;
|
||||
|
||||
<<<<<<< HEAD
|
||||
use std::{collections::HashMap, sync::mpsc, thread, time::Duration};
|
||||
=======
|
||||
use winit::{
|
||||
event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
|
||||
event_loop::{ControlFlow, EventLoop},
|
||||
window::{CursorIcon, Fullscreen, WindowBuilder},
|
||||
};
|
||||
>>>>>>> master
|
||||
|
||||
use winit::{
|
||||
event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue