nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 06:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
barredterra
2024-05-27 18:54:17 +02:00
parent b1a911aa9c
commit a53a80f01d
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/doctype/company/company.json
View File

@@ -712,11 +712,7 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-10-23 10:19:24.322898",
=======
"modified": "2024-05-27 17:32:49.057386",
>>>>>>> 06401cc84f (fix: allow Auditor to select a company)
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",