From 322f0db1e9f03716ff635dd343cec2f31e35df10 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Tue, 3 May 2022 18:28:50 +0530
Subject: [PATCH] chore: Resolve conflicts

---
 erpnext/hooks.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index d93c5818d5..066249ba22 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -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",