CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 22:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-02-10 10:38:18 +05:30
parent e3cceb894b
commit 1d6c50c9a1
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -822,11 +822,7 @@
"image_field": "image",
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-01-03 17:36:20.984421",
=======
"modified": "2025-02-07 13:54:40.122345",
>>>>>>> 0207d2d7b6 (fix: unable to remove image from employee)
"modified_by": "Administrator",
"module": "Setup",
"name": "Employee",