fix: merge and cache conflicts resolved

widget_group_17/assignments/models.py

@@ -11,7 +11,11 @@ class Assignment(models.Model):
     name = models.CharField(max_length=50)
     description = models.CharField(max_length=500)
     max_points = models.IntegerField(default=0)
+    #def set_passing_score():
+    #    return (max_points * 60) / 100
     passing_score = models.IntegerField(default=0)
     
     def _str_(self):
         return self.name
+    
+    
\ No newline at end of file