Merge remote-tracking branch 'origin/main'

# Conflicts: # src/styles/_theme.scss
sopra-fs24-group-09 · Mar 25, 2024 · 3296afa · 3296afa
2 parents c281ea0 + 14f912a
commit 3296afa
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/styles/_theme.scss b/src/styles/_theme.scss
@@ -21,6 +21,7 @@ $greyBlue: rgba(201, 215, 221, 1);
 $whiteYellow: rgba(255, 252, 245, 1);
 
 
+>>>>>>>>> Temporary merge branch 2
 /* some constants */
 
 $DESKTOP_WIDTH: 1160px;