chore: Resolve conflicts

frappe · May 3, 2022 · 322f0db · 322f0db
1 parent 2e3e666
commit 322f0db
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
@@ -80,14 +80,7 @@
 	"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",