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

chore: resolve conflicts

Browse Source
This commit is contained in:
Diptanil Saha
2026-07-29 04:35:16 +05:30
committed by GitHub
parent bdbc1cd6c1
commit 56f3983f2d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches.txt
View File

@@ -494,8 +494,4 @@ erpnext.patches.v16_0.access_control_for_project_users
erpnext.patches.v16_0.enable_book_stock_expense_gl_entries erpnext.patches.v16_0.enable_book_stock_expense_gl_entries
erpnext.patches.v16_0.rename_ar_ap_ageing_filter erpnext.patches.v16_0.rename_ar_ap_ageing_filter
erpnext.patches.v16_0.fix_subcontracting_titles erpnext.patches.v16_0.fix_subcontracting_titles
<<<<<<< HEAD
=======
erpnext.patches.v16_0.move_warehouse_defaults_to_company
erpnext.patches.v16_0.backfill_repost_accounting_ledger_status erpnext.patches.v16_0.backfill_repost_accounting_ledger_status
>>>>>>> 372dff2ffa (refactor(accounts): repost accounting ledger (#56442))