Skip to content

Commit 4b77818

Browse files
committed
chore: fix rebase issue
* Fix rebase issue for fix for issue less#4258.
1 parent f10abf4 commit 4b77818

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

packages/test-data/css/_main/variables.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,14 @@
6969
mul-px-2: 140px;
7070
mul-px-3: 140px;
7171
}
72-
<<<<<<< HEAD
7372
*,
7473
::before,
7574
::after {
7675
--tw-pan-x: ;
7776
--tw-pan-y: ;
7877
--tw-pinch-zoom: ;
7978
--tw-scroll-snap-strictness: proximity;
80-
=======
79+
}
8180
.radio_checked {
8281
border-color: #fff;
83-
>>>>>>> 9434f18b (fix(issue:4258) variable interpolation after math)
8482
}

0 commit comments

Comments
 (0)