fixed bare1

examples/rtic_bare2.rs

@@ -155,10 +155,14 @@ End of assembler dump.
 //
 //    Answer in your own words, why you believe the generated code differs?
 //
+<<<<<<< HEAD
 /*
 To save space the compiler makes some optimizations in the code.
 So wait is now compiled as a function and takes an argument in r0 instead of 
 just setting a value before it runs.
 */
+=======
+//      It starts the wait function where it just loops nops.
+>>>>>>> a08f880 (bare1-3 done)
 //
 //    Commit your answers (bare2_3)