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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-08-13 11:37:40 +05:30
committed by GitHub
parent 4ca1f3b9cf
commit a3032910a7
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/selling_settings/selling_settings.json
View File

@@ -193,11 +193,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-03-03 11:16:54.333615",
=======
"modified": "2023-08-09 15:35:42.914354", "modified": "2023-08-09 15:35:42.914354",
>>>>>>> 32863b4922 (fix: Make default sales update frequency as monthly instead of each transaction)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",
@@ -226,4 +222,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }