nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(minor): clear merge conflicts

Browse Source
This commit is contained in:
Rushabh Mehta
2021-01-12 10:29:00 +05:30
parent 7619d3d6d6
commit 37aa81526a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/page/point_of_sale/pos_item_selector.js
View File

@@ -260,11 +260,7 @@ erpnext.PointOfSale.ItemSelector = class {
add_filtered_item_to_cart() { add_filtered_item_to_cart() {
this.$items_container.find(".item-wrapper").click(); this.$items_container.find(".item-wrapper").click();
} }
<<<<<<< HEAD
=======
>>>>>>> develop
resize_selector(minimize) { resize_selector(minimize) {
minimize ? minimize ?
this.$component.find('.filter-section').css('grid-template-columns', 'repeat(1, minmax(0, 1fr))') : this.$component.find('.filter-section').css('grid-template-columns', 'repeat(1, minmax(0, 1fr))') :