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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-02-25 18:13:42 +05:30
committed by GitHub
parent 941a78e1a8
commit 8f922382e4
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

@@ -467,7 +467,4 @@ erpnext.patches.v16_0.update_company_custom_field_in_bin
erpnext.patches.v15_0.replace_http_with_https_in_sales_partner
erpnext.patches.v15_0.delete_quotation_lost_record_detail
erpnext.patches.v16_0.add_portal_redirects
<<<<<<< HEAD
=======
erpnext.patches.v16_0.complete_onboarding_steps_for_older_sites #2
>>>>>>> d90ec49241 (fix: patch to complete onboarding stpes for existing records)