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

chore: resolve conflict

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/workspace/accounting/accounting.json
View File

@@ -621,11 +621,7 @@
"doc_view": "List", "doc_view": "List",
"label": "Learn Accounting", "label": "Learn Accounting",
"type": "URL", "type": "URL",
<<<<<<< HEAD
"url": "https://frappe.school/courses/erpnext-accounting?utm_source=in_app"
=======
"url": "https://school.frappe.io/lms/courses/erpnext-accounting?utm_source=in_app" "url": "https://school.frappe.io/lms/courses/erpnext-accounting?utm_source=in_app"
>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
}, },
{ {
"label": "Chart of Accounts", "label": "Chart of Accounts",

4
erpnext/buying/workspace/buying/buying.json
View File

@@ -537,11 +537,7 @@
"doc_view": "List", "doc_view": "List",
"label": "Learn Procurement", "label": "Learn Procurement",
"type": "URL", "type": "URL",
<<<<<<< HEAD
"url": "https://frappe.school/courses/procurement?utm_source=in_app"
=======
"url": "https://school.frappe.io/lms/courses/procurement?utm_source=in_app" "url": "https://school.frappe.io/lms/courses/procurement?utm_source=in_app"
>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
}, },
{ {
"color": "Yellow", "color": "Yellow",

4
erpnext/manufacturing/workspace/manufacturing/manufacturing.json
View File

@@ -336,11 +336,7 @@
"doc_view": "List", "doc_view": "List",
"label": "Learn Manufacturing", "label": "Learn Manufacturing",
"type": "URL", "type": "URL",
<<<<<<< HEAD
"url": "https://frappe.school/courses/manufacturing?utm_source=in_app"
=======
"url": "https://school.frappe.io/lms/courses/manufacturing?utm_source=in_app" "url": "https://school.frappe.io/lms/courses/manufacturing?utm_source=in_app"
>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
}, },
{ {
"color": "Grey", "color": "Grey",

4
erpnext/projects/workspace/projects/projects.json
View File

@@ -210,11 +210,7 @@
"doc_view": "List", "doc_view": "List",
"label": "Learn Project Management", "label": "Learn Project Management",
"type": "URL", "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" "url": "https://school.frappe.io/lms/courses/project-management?utm_source=in_app"
>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
}, },
{ {
"color": "Blue", "color": "Blue",

9
erpnext/selling/workspace/selling/selling.json
View File

@@ -639,11 +639,7 @@
"doc_view": "List", "doc_view": "List",
"label": "Learn Sales Management", "label": "Learn Sales Management",
"type": "URL", "type": "URL",
<<<<<<< HEAD
"url": "https://frappe.school/courses/sales-management-course?utm_source=in_app"
=======
"url": "https://school.frappe.io/lms/courses/sales-management-course?utm_source=in_app" "url": "https://school.frappe.io/lms/courses/sales-management-course?utm_source=in_app"
>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
}, },
{ {
"label": "Point of Sale", "label": "Point of Sale",
@@ -680,11 +676,6 @@
"type": "Dashboard" "type": "Dashboard"
} }
], ],
<<<<<<< HEAD
"title": "Selling"
}
=======
"title": "Selling", "title": "Selling",
"type": "Workspace" "type": "Workspace"
} }
>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))

4
erpnext/stock/workspace/stock/stock.json
View File

@@ -802,11 +802,7 @@
"doc_view": "List", "doc_view": "List",
"label": "Learn Inventory Management", "label": "Learn Inventory Management",
"type": "URL", "type": "URL",
<<<<<<< HEAD
"url": "https://frappe.school/courses/inventory-management?utm_source=in_app"
=======
"url": "https://school.frappe.io/lms/courses/inventory-management?utm_source=in_app" "url": "https://school.frappe.io/lms/courses/inventory-management?utm_source=in_app"
>>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
}, },
{ {
"color": "Yellow", "color": "Yellow",