merge ocelot master resolve conflicts

This commit is contained in:
ogerly 2022-09-23 08:50:00 +02:00
commit 58079c5b8e
2 changed files with 1 additions and 6 deletions

View File

@ -1,5 +0,0 @@
/*
*
* Here, all SCSS variables and classes can be adapted to your custom design.
*
*/

View File

@ -25,4 +25,4 @@ $color-locale-menu: $color-primary-light;
.main-navigation .base-button {
color: $color-primary-light;
}
}