Push Umbe

2024-12-12 18:51:23 +01:00
parent bb6c75246e
commit 9bcccf8ebb
2 changed files with 3 additions and 13 deletions
--- a/src/components/design/sidebars/cards/cardVApromo.svelte
+++ b/src/components/design/sidebars/cards/cardVApromo.svelte
@@ -1,12 +1,8 @@
 <script>
 	import { PRICES } from "#lib/constants";
 </script>
-<<<<<<< HEAD:src/components/design/sidebars/cards/cardVApromo.svelte
 	
-<div id ="cardVApromo" 
-	class="	box card">
-=======
->>>>>>> origin/UMBE:src/components/design/sidebars/cards/card-VA-promo.svelte
+<div id ="cardVApromo" class="	box card">

 <div id="card-VA-promo" class="	box card bg-white px-6 py-4 mb-5">
 	<div class="grid">
@@ -31,5 +27,7 @@
 	</div>
 </div>

+</div>
+
 <style lang="scss">
 </style>