• Author: Colin de Groot
• Date: 11/13/2025, 4:17:09 PM
• Message: [BUG] conflict resolve
• Stats: 440 total changes (+212 / -228)

Changed Files

• src/lib/component/Filter.svelte — +2 / -2 (4 changes)
• src/lib/component/product.svelte — +15 / -15 (30 changes)
• src/lib/styles/style.css — +157 / -80 (237 changes)
• src/routes/+page.svelte — +38 / -33 (71 changes)
• src/style.css — +0 / -98 (98 changes)
• static/fonts/Parkinsans-Bold.ttf — +0 / -0 (0 changes)
• static/fonts/Parkinsans-ExtraBold.ttf — +0 / -0 (0 changes)
• static/fonts/Parkinsans-Light.ttf — +0 / -0 (0 changes)
• static/fonts/Parkinsans-Regular.ttf — +0 / -0 (0 changes)
• static/fonts/Parkinsans-SemiBold.ttf — +0 / -0 (0 changes)