chore: resolve conflict

This commit is contained in:
ruthra kumar
2025-04-07 11:28:39 +05:30
parent 2dfe13e183
commit 3d57916832
6 changed files with 0 additions and 29 deletions

View File

@@ -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",