From 2c4f133b8c425e23b795f1e394125c28196fa943 Mon Sep 17 00:00:00 2001
From: Marius Engen <marius@edyou.no>
Date: Wed, 23 Feb 2022 12:54:37 +0100
Subject: [PATCH 1/2] my branch
---
frontend/www/index.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/frontend/www/index.html b/frontend/www/index.html
index bf98ea0f..3a83ed56 100644
--- a/frontend/www/index.html
+++ b/frontend/www/index.html
@@ -21,6 +21,7 @@
You can conveniently log a workout using either our website or our app. You can also view and comment on others'
workouts!
</p>
+ <p>This is my branch, wohooo!</p>
<img src="img/fitness.jpg" class="img-fluid" alt="DUMBBELLS">
</div>
</div>
--
GitLab
From 57144c3184520cff67e0c8074a0ea7b3c601ac72 Mon Sep 17 00:00:00 2001
From: Marius Engen <marius@edyou.no>
Date: Wed, 23 Feb 2022 12:57:10 +0100
Subject: [PATCH 2/2] feature 1 fix in html-file
---
frontend/www/index.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/frontend/www/index.html b/frontend/www/index.html
index 3a83ed56..331a7f52 100644
--- a/frontend/www/index.html
+++ b/frontend/www/index.html
@@ -21,6 +21,7 @@
You can conveniently log a workout using either our website or our app. You can also view and comment on others'
workouts!
</p>
+ <p>SecFit</p>
<p>This is my branch, wohooo!</p>
<img src="img/fitness.jpg" class="img-fluid" alt="DUMBBELLS">
</div>
--
GitLab