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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-01-31 15:23:14 +05:30
committed by GitHub
parent e9314325cc
commit 510ab769f1
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/buying/doctype/buying_settings/buying_settings.json
View File

@@ -214,11 +214,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-01-30 14:04:43.177427",
=======
"modified": "2024-01-31 13:34:18.101256", "modified": "2024-01-31 13:34:18.101256",
>>>>>>> 0c9572bb48 (fix: conditionally display show btn setting)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Buying Settings", "name": "Buying Settings",
@@ -268,4 +264,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }