chore: resolved conflicts

2023-08-26 16:00:44 +05:30
parent 0487b2c987 e2c1f6aa2d
commit 9376b0b010
60 changed files with 406 additions and 367 deletions
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -2337,4 +2337,11 @@ select {
 	.course-list-buttons .btn {
 		margin-left: 0;
 	}
+}
+
+.slots-parent {
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	grid-gap: 0.5rem;
+	margin-bottom: 1rem;
 }