- Resolve merge problems

biscuit/apps/chronos/views.py

@@ -8,7 +8,7 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.utils import timezone
 from material import Fieldset, Row
 
-from schoolapps.settings import SHORT_WEEK_DAYS, LONG_WEEK_DAYS, WEEK_DAYS
+from schoolapps.settings import SHORT_WEEK_DAYS, LONG_WEEK_DAYS
 from timetable.filters import HintFilter
 from timetable.forms import HintForm
 from timetable.hints import get_all_hints_by_date, get_all_hints_by_time_period, get_all_hints_by_class_and_time_period