Fixed merge conflict with master

widget_jenicaesports/widget_calendar/models.py

 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from assignments import models as assignments_models
 
 class Location(models.Model):
 
@@ -23,7 +24,7 @@ class Event(models.Model):
     activity = models.TextField(default='')
     estimated_hours = models.FloatField(default='')
     location = models.ForeignKey(Location, on_delete=models.CASCADE)
-    course = models.CharField(max_length=255, default='')
+    course = models.ForeignKey(assignments_models.Course, on_delete=models.CASCADE)
     
     def __str__(self):
         return '{} on {} at {}'.format(