Fixed merge conflict
This commit is contained in:
@@ -44,7 +44,7 @@ calendars = ["Task", "Production Order", "Leave Application", "Sales Order", "Ho
|
||||
|
||||
fixtures = ["Web Form"]
|
||||
|
||||
website_generators = ["Item Group", "Item", "Sales Partner", "Job Opening", "Student Admission"]
|
||||
website_generators = ["Item Group", "Item", "BOM", "Sales Partner", "Job Opening", "Student Admission"]
|
||||
|
||||
website_context = {
|
||||
"favicon": "/assets/erpnext/images/favicon.png",
|
||||
@@ -96,6 +96,7 @@ website_route_rules = [
|
||||
},
|
||||
{"from_route": "/jobs", "to_route": "Job Opening"},
|
||||
{"from_route": "/admissions", "to_route": "Student Admission"},
|
||||
{"from_route": "/boms", "to_route": "BOM"}
|
||||
]
|
||||
|
||||
portal_menu_items = [
|
||||
|
||||
Reference in New Issue
Block a user