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

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-04-22 10:08:26 +05:30
parent c1187bed26
commit cfa1a2b050
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/support/doctype/service_level_agreement/service_level_agreement.json
View File

@@ -198,11 +198,7 @@
} }
], ],
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-07-27 11:16:45.596579",
=======
"modified": "2023-04-21 17:16:56.192560", "modified": "2023-04-21 17:16:56.192560",
>>>>>>> ac871797b2 (fix: SLA permissions (#34981))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Service Level Agreement", "name": "Service Level Agreement",