From 762fa957aa4bc33a2585d80fd57653268adf5cd5 Mon Sep 17 00:00:00 2001
From: tommy <anetom-6@student.ltu.se>
Date: Tue, 9 Mar 2021 13:53:52 +0100
Subject: [PATCH] fixed bare1

---
 examples/rtic_bare2.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/rtic_bare2.rs b/examples/rtic_bare2.rs
index fcc408f..7ed17fc 100644
--- a/examples/rtic_bare2.rs
+++ b/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)
-- 
GitLab