fix merge leftover

ralucaStan · ralucaStan · commit db454cf8202f · 2025-07-28T17:16:07.000+02:00
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/cart/style.scss b/plugins/woocommerce/client/blocks/assets/js/blocks/cart/style.scss
@@ -184,10 +184,7 @@
 		min-height: 15em;
 		display: block;
 		@include skeleton-animation();
-<<<<<<< HEAD
 		@include skeleton-animation-fade();
-=======
->>>>>>> trunk
 	}
 
 	.wp-block-woocommerce-cart-totals-block {
@@ -205,15 +202,11 @@
 		min-height: 48px;
 		display: block;
 		@include skeleton-animation();
-<<<<<<< HEAD
 		@include skeleton-animation-fade();
-=======
->>>>>>> trunk
 		margin: 0 0 1em 0;
 	}
 
 	div.wp-block-woocommerce-cart-order-summary-block {
-<<<<<<< HEAD
 		height: 200px;
 	}
 	div.wp-block-woocommerce-cart-order-summary-totals-block {
@@ -232,9 +225,6 @@
 		&::after {
 			background: transparent;
 		}
-=======
-		height: 20em;
->>>>>>> trunk
 	}
 	div.wp-block-woocommerce-cart-order-summary-totals-block {
 		border-top: none;
