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

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2024-10-22 01:23:49 +05:30
committed by GitHub
parent 0a03076148
commit 1d5345abc1
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@@ -377,9 +377,6 @@ erpnext.patches.v15_0.drop_index_posting_datetime_from_sle
erpnext.patches.v15_0.add_disassembly_order_stock_entry_type #1 erpnext.patches.v15_0.add_disassembly_order_stock_entry_type #1
erpnext.patches.v15_0.set_standard_stock_entry_type erpnext.patches.v15_0.set_standard_stock_entry_type
erpnext.patches.v15_0.link_purchase_item_to_asset_doc erpnext.patches.v15_0.link_purchase_item_to_asset_doc
<<<<<<< HEAD
erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter
=======
erpnext.patches.v15_0.migrate_to_utm_analytics erpnext.patches.v15_0.migrate_to_utm_analytics
erpnext.patches.v15_0.update_task_assignee_email_field_in_asset_maintenance_log erpnext.patches.v15_0.update_task_assignee_email_field_in_asset_maintenance_log
>>>>>>> 5911934dc7 (feat: added assignee email field in asset maintenance log)