Fix SCSS merge conflict in logo-carousel styles

2 weeks ago · 55055bdfa8
1 changed files with 0 additions and 3 deletions
--- a/libs/ui/src/lib/logo-carousel/logo-carousel.component.scss
+++ b/libs/ui/src/lib/logo-carousel/logo-carousel.component.scss
@ -215,12 +215,9 @@
      &.logo-selfhostedhub,
      &.logo-sourceforge,
      &.logo-umbrel,
-<<<<<<< HEAD
      &.logo-unraid,
      &.logo-selfhostedhub{
-=======
      &.logo-unraid{
->>>>>>> 658a894d (changes added after review)
        background-color: rgba(var(--light-primary-text));
      }
    }