Merge remote-tracking branch 'origin/master' into feature/cc-864/mast…

…er-split-delivery # Conflicts: # Bundles/CustomerPage/src/SprykerShop/Yves/CustomerPage/Theme/default/components/molecules/order-detail-table/order-detail-table.twig # Bundles/ProductPackagingUnitWidget/src/SprykerShop/Yves/ProductPackagingUnitWidget/Theme/default/components/molecules/summary-product-packaging-unit/summary-product-packaging-unit.twig
spryker-shop · Sep 2, 2019 · efaf194 · efaf194
2 parents 0765109 + 28b8e4e
commit efaf194
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/...logPage/Theme/default/components/molecules/active-filter-rating/active-filter-rating.twig b/...logPage/Theme/default/components/molecules/active-filter-rating/active-filter-rating.twig
@@ -1,3 +1,4 @@
+{# fe-sniffer:disabled correct-twig-component-structure #}
 {% extends molecule('active-filter', 'CatalogPage') %}
 
 {% define data = {

diff --git a/...ves/CatalogPage/Theme/default/components/molecules/view-mode-switch/view-mode-switch.twig b/...ves/CatalogPage/Theme/default/components/molecules/view-mode-switch/view-mode-switch.twig
@@ -2,7 +2,6 @@
 
 {% define config = {
     name: 'view-mode-switch',
-    tag: 'div'
 } %}
 
 {% set gridHref = path('change-view-mode', { mode: 'grid', 'referer-url': app.request.requestUri }) %}