From a4479fabb1d2cf662fac5d5b323e5bbaf95360b4 Mon Sep 17 00:00:00 2001
From: RishabhSharma96 <114917946+RishabhSharma96@users.noreply.github.com>
Date: Fri, 16 Feb 2024 18:47:36 +0530
Subject: [PATCH] removed conflicts from approve request from dean
---
.../templates/gymkhanaModule/clubsessions.html | 0
.../templates/gymkhanaModule/gymkhana.html | 16 ++++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
delete mode 100644 FusionIIIT/templates/gymkhanaModule/clubsessions.html
diff --git a/FusionIIIT/templates/gymkhanaModule/clubsessions.html b/FusionIIIT/templates/gymkhanaModule/clubsessions.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/FusionIIIT/templates/gymkhanaModule/gymkhana.html b/FusionIIIT/templates/gymkhanaModule/gymkhana.html
index bedfe767f..141ac70b9 100644
--- a/FusionIIIT/templates/gymkhanaModule/gymkhana.html
+++ b/FusionIIIT/templates/gymkhanaModule/gymkhana.html
@@ -355,19 +355,23 @@
Update Activity Calender
-
-
+
+
+
-
+
+
+
Submit Event report To Convener