CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-12 17:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-09 21:03:37 +05:30
committed by GitHub
parent 29d33b3139
commit e9212c6a32
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/workspace_sidebar/invoicing.json
View File

@@ -314,11 +314,7 @@
"type": "Link"
}
],
<<<<<<< HEAD:erpnext/workspace_sidebar/invoicing.json
"modified": "2026-01-26 21:23:15.665712",
=======
"modified": "2026-01-08 15:04:31.767795",
>>>>>>> 8acf373e68 (fix: Workspace sidebar links for Debit/Credit Notes):erpnext/workspace_sidebar/accounting.json
"modified": "2026-01-27 21:23:15.665712",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Invoicing",