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