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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-03-05 13:08:47 +05:30
committed by GitHub
parent f29c43811c
commit 446a8fe096
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/support/doctype/issue/issue.json
View File

@@ -391,11 +391,7 @@
"icon": "fa fa-ticket",
"idx": 7,
"links": [],
<<<<<<< HEAD
"modified": "2021-11-24 13:13:10.276630",
=======
"modified": "2025-02-18 21:18:52.797745",
>>>>>>> 019303dd12 (fix: tests)
"modified_by": "Administrator",
"module": "Support",
"name": "Issue",
@@ -424,4 +420,4 @@
"title_field": "subject",
"track_changes": 1,
"track_seen": 1
}
}