Browse Source
Fix SCSS merge conflict in logo-carousel styles
pull/5786/head
Vaishnavi Parabkar
2 weeks ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
0 additions and
3 deletions
-
libs/ui/src/lib/logo-carousel/logo-carousel.component.scss
|
|
@ -215,12 +215,9 @@ |
|
|
&.logo-selfhostedhub, |
|
|
&.logo-selfhostedhub, |
|
|
&.logo-sourceforge, |
|
|
&.logo-sourceforge, |
|
|
&.logo-umbrel, |
|
|
&.logo-umbrel, |
|
|
<<<<<<< HEAD |
|
|
|
|
|
&.logo-unraid, |
|
|
&.logo-unraid, |
|
|
&.logo-selfhostedhub{ |
|
|
&.logo-selfhostedhub{ |
|
|
======= |
|
|
|
|
|
&.logo-unraid{ |
|
|
&.logo-unraid{ |
|
|
>>>>>>> 658a894d (changes added after review) |
|
|
|
|
|
background-color: rgba(var(--light-primary-text)); |
|
|
background-color: rgba(var(--light-primary-text)); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
