From a5acc13451c5467513dde5996a7eca15ae9032e8 Mon Sep 17 00:00:00 2001
From: janmax <mail-github@jmx.io>
Date: Fri, 10 Nov 2017 21:46:50 +0100
Subject: [PATCH] Cleaning up some merge conflict leftovers
---
backend/core/serializers.py | 2 --
backend/core/urls.py | 1 -
2 files changed, 3 deletions(-)
diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index c58def52..17564bb8 100644
--- a/backend/core/serializers.py
+++ b/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):
diff --git a/backend/core/urls.py b/backend/core/urls.py
index 962f6681..f9b3345c 100644
--- a/backend/core/urls.py
+++ b/backend/core/urls.py
@@ -13,4 +13,3 @@ urlpatterns = [
]
urlpatterns += staticfiles_urlpatterns()
-urlpatterns = format_suffix_patterns(urlpatterns, allowed=['json', 'html'])
--
GitLab