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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-04-26 13:47:03 +05:30
committed by GitHub
parent 4555f8a9a6
commit a292e52b34
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
View File

@@ -77,11 +77,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-11-01 16:14:29.080697",
=======
"modified": "2024-04-24 12:19:40.204888", "modified": "2024-04-24 12:19:40.204888",
>>>>>>> aefbe21b46 (feat: allow to do reposting for all transactions (audit))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reposting Settings", "name": "Stock Reposting Settings",
@@ -102,4 +98,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }