resolving conflicts

2018-12-14 18:12:13 -08:00 · 2018-12-14 18:12:13 -08:00 · 0c9e3eb6ba
parent 1bf9ab1fb5
commit 0c9e3eb6ba
1 changed files with 1 additions and 3 deletions
--- 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;
 	}