Merge branch 'master' of gitlab.control.lth.se:andersn/tutorial

0348ba1d · Anders Nilsson · d73c1297 · 1cb8e466 · 0348ba1d · 0348ba1d
Commit 0348ba1d authored 5 years ago by Anders Nilsson
--- a/temp_file.txt
+++ b/temp_file.txt
+Let's see if we can mess this up!
+Hi! Finally here. :)
\ No newline at end of file
--- a/test.txt
+++ b/test.txt
@@ -7,12 +7,4 @@ Dante?
 Just added a new line of text.
+I want to be here // Nils
-# Albin was here #
-Hello //Frida
-So was Nils. Check out Fridas repo as well
-## Olle was here as well ##