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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-12 10:21:44 +05:30
committed by GitHub
parent 48a4effdb6
commit 4094fbd6c5
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
View File

@@ -247,11 +247,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-02-12 10:53:32.090309",
"modified": "2024-03-15 15:22:24.003486",
=======
"modified": "2025-02-12 09:53:32.090309",
>>>>>>> a007dc285d (fix: changed naming series to random for SABB)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial and Batch Bundle", "name": "Serial and Batch Bundle",
@@ -389,4 +385,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"title_field": "item_code" "title_field": "item_code"
} }