home-assistant/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2026-02-04 01:10:33 -06:00
Code Issues Packages Projects Releases 748 Wiki Activity

Fix unresolved merge conflict in core style

Browse Source
This commit is contained in:
Paul Bottein 2025-10-11 14:41:42 +02:00
parent 07a5c41fd4
commit 0aa2941868
No known key found for this signature in database
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/resources/theme/core.globals.ts
View File

@ -19,8 +19,6 @@ export const coreStyles = css`
--ha-border-radius-pill: 9999px;
--ha-border-radius-circle: 50%;
--ha-border-radius-square: 0;
<<<<<<< HEAD
=======
/* Spacing */
--ha-space-0: 0px;
@ -44,7 +42,6 @@ export const coreStyles = css`
--ha-space-18: 72px;
--ha-space-19: 76px;
--ha-space-20: 80px;
>>>>>>> 994c1b575 (Fix intl polyfill loading (#27261))
}
`;