Push Umbe

This commit is contained in:
Robert Jagtiani
2024-12-12 18:51:23 +01:00
parent bb6c75246e
commit 9bcccf8ebb
2 changed files with 3 additions and 13 deletions

View File

@@ -1,12 +1,8 @@
<script> <script>
import { PRICES } from "#lib/constants"; import { PRICES } from "#lib/constants";
</script> </script>
<<<<<<< HEAD:src/components/design/sidebars/cards/cardVApromo.svelte
<div id ="cardVApromo" <div id ="cardVApromo" class=" box card">
class=" box card">
=======
>>>>>>> origin/UMBE:src/components/design/sidebars/cards/card-VA-promo.svelte
<div id="card-VA-promo" class=" box card bg-white px-6 py-4 mb-5"> <div id="card-VA-promo" class=" box card bg-white px-6 py-4 mb-5">
<div class="grid"> <div class="grid">
@@ -31,5 +27,7 @@
</div> </div>
</div> </div>
</div>
<style lang="scss"> <style lang="scss">
</style> </style>

View File

@@ -1,10 +1,6 @@
--- ---
import Layout from "#layouts/Layout.astro"; import Layout from "#layouts/Layout.astro";
<<<<<<< HEAD
import ProduktVergleich from "#content/produktVergleich.svelte"; import ProduktVergleich from "#content/produktVergleich.svelte";
=======
import BannerSaeule from "#content/BannerSaeule.svelte";
>>>>>>> origin/UMBE
--- ---
@@ -12,11 +8,7 @@ import BannerSaeule from "#content/BannerSaeule.svelte";
<h1>Unsere Ausweise im Detail:</h1> <h1>Unsere Ausweise im Detail:</h1>
<<<<<<< HEAD
<!-- <ProduktVergleich /> --> <!-- <ProduktVergleich /> -->
=======
<BannerSaeule client:load />
>>>>>>> origin/UMBE
</Layout> </Layout>