Cleaning up some merge conflict leftovers

backend/core/serializers.py

@@ -2,7 +2,6 @@ from rest_framework import serializers
 from core.models import Student, Submission, Feedback, ExamType
 
 from core.models import Feedback, Student, Submission
-=======
 from rest_framework import serializers
 from core.models import Student, Submission, Feedback, ExamType
 
@@ -11,7 +10,6 @@ class ExamSerializer(serializers.ModelSerializer):
     class Meta:
         model = ExamType
         fields = ('module_reference', 'total_score', 'pass_score', 'pass_only',)
->>>>>>> First step towards REST + Vue Student Page
 
 
 class FeedbackSerializer(serializers.ModelSerializer):

backend/core/urls.py

@@ -13,4 +13,3 @@ urlpatterns = [
 ]
 
 urlpatterns += staticfiles_urlpatterns()
-urlpatterns = format_suffix_patterns(urlpatterns, allowed=['json', 'html'])