mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-06 23:10:26 +00:00
chore: resolve conflict
This commit is contained in:
@@ -210,11 +210,7 @@
|
||||
"doc_view": "List",
|
||||
"label": "Learn Project Management",
|
||||
"type": "URL",
|
||||
<<<<<<< HEAD
|
||||
"url": "https://frappe.school/courses/project-management?utm_source=in_app"
|
||||
=======
|
||||
"url": "https://school.frappe.io/lms/courses/project-management?utm_source=in_app"
|
||||
>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
|
||||
},
|
||||
{
|
||||
"color": "Blue",
|
||||
|
||||
Reference in New Issue
Block a user