mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 00:14:50 +00:00
chore: Resolve conflicts
This commit is contained in:
@@ -80,14 +80,7 @@ calendars = [
|
|||||||
"Holiday List",
|
"Holiday List",
|
||||||
]
|
]
|
||||||
|
|
||||||
website_generators = [
|
website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner", "Job Opening"]
|
||||||
"Item Group",
|
|
||||||
"Website Item",
|
|
||||||
"BOM",
|
|
||||||
"Sales Partner",
|
|
||||||
"Job Opening",
|
|
||||||
"Student Admission",
|
|
||||||
]
|
|
||||||
|
|
||||||
website_context = {
|
website_context = {
|
||||||
"favicon": "/assets/erpnext/images/erpnext-favicon.svg",
|
"favicon": "/assets/erpnext/images/erpnext-favicon.svg",
|
||||||
|
|||||||
Reference in New Issue
Block a user