# Conflicts:
#	requirements.txt
#	schoolapps/dashboard/urls.py
#	schoolapps/dashboard/views.py
#	schoolapps/helper.py
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/parse.py
#	schoolapps/untisconnect/plan.py