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

fixed conflicts

Browse Source
This commit is contained in:
Rohit Waghchaure
2019-10-15 14:18:59 +05:30
parent cf24191fe5
commit 66072fec5a
6 changed files with 540 additions and 2593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
View File

@@ -713,7 +713,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2019-01-26 13:54:24.575322",
"modified": "2019-10-14 13:54:24.575322",
"modified_by": "Administrator",
"module": "Shopping Cart",
"name": "Shopping Cart Settings",