From 0c9e3eb6baa751703fb9a68194411bf58f4c984d Mon Sep 17 00:00:00 2001 From: David Levin Date: Fri, 14 Dec 2018 18:12:13 -0800 Subject: [PATCH] resolving conflicts --- plugins/woocommerce-blocks/assets/js/utils/get-query.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/woocommerce-blocks/assets/js/utils/get-query.js b/plugins/woocommerce-blocks/assets/js/utils/get-query.js index 6997f5f21c3..862dab8f1cb 100644 --- a/plugins/woocommerce-blocks/assets/js/utils/get-query.js +++ b/plugins/woocommerce-blocks/assets/js/utils/get-query.js @@ -33,13 +33,11 @@ export default function getQuery( attributes, name ) { case 'woocommerce/product-best-sellers': query.orderby = 'popularity'; break; -<<<<<<< HEAD case 'woocommerce/product-top-rated': query.orderby = 'rating'; -======= + break; case 'woocommerce/product-on-sale': query.on_sale = 1; ->>>>>>> 75e957b33c668e2ef98500fab68ecfe8ca705ac4 break; }