fix overlooked merge conflict

Author: calebbourg

cross/join/src/main.rs

@@ -29,12 +29,8 @@ use embedded_time::rate::Extensions;
 use hal::clocks::Clock;
 use hal::pac;
 
-<<<<<<< HEAD:cross/join/src/main.rs
 use embedded_hal::spi::MODE_0;
 use embedded_hal::blocking::delay::DelayMs;
-=======
-use embedded_hal::delay::blocking::DelayUs;
->>>>>>> 50a5b0a (add Operation):examples/join.rs
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.