Fix the examples

This commit is contained in:
Ryan Goldstein 2019-09-24 19:44:43 -04:00
parent 86bafdc104
commit dcd9ddde50
3 changed files with 18 additions and 34 deletions

View file

@ -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},