chore: Resolve conflicts

This commit is contained in:
Deepesh Garg 2022-05-03 18:28:50 +05:30
parent 2e3e666784
commit 322f0db1e9

View File

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