Skip to content
Snippets Groups Projects
Commit 27d5fe1c authored by Dominik Seeger's avatar Dominik Seeger :ghost: Committed by Jakob Dieterle
Browse files

renamed field

parent 82bd28fc
No related branches found
No related tags found
1 merge request!244Resolve "Make exam a many to many field on StudentInfo model"
......@@ -32,6 +32,7 @@ class ExamInfo(models.Model):
exam = models.ForeignKey(ExamType,
on_delete=models.CASCADE,
related_name='exam_infos',
<<<<<<< HEAD
=======
class StudentsExam(models.Model):
exam = models.ForeignKey('ExamType',
......@@ -42,6 +43,8 @@ class ExamInfo(models.Model):
on_delete=models.CASCADE,
related_name='exam',
>>>>>>> added new many-to-many field and wrapper class
=======
>>>>>>> renamed field
null=False)
student = models.ForeignKey('StudentInfo',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment