From 4b77818f266aa23dae78bf6561639546968dcc09 Mon Sep 17 00:00:00 2001 From: Daniel Puckowski Date: Sun, 8 Dec 2024 07:46:49 -0500 Subject: [PATCH] chore: fix rebase issue * Fix rebase issue for fix for issue #4258. --- packages/test-data/css/_main/variables.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/test-data/css/_main/variables.css b/packages/test-data/css/_main/variables.css index 9375358d2..3fac8c7f4 100644 --- a/packages/test-data/css/_main/variables.css +++ b/packages/test-data/css/_main/variables.css @@ -69,7 +69,6 @@ mul-px-2: 140px; mul-px-3: 140px; } -<<<<<<< HEAD *, ::before, ::after { @@ -77,8 +76,7 @@ --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; -======= +} .radio_checked { border-color: #fff; ->>>>>>> 9434f18b (fix(issue:4258) variable interpolation after math) }