solving conflict with cr

FusionIIIT · ChaudharyRaman · Apr 25, 2024 · Apr 14, 2024 · Apr 14, 2024 · Apr 14, 2024
commit 22dd7b13c2632230e4f72f1c41a061d3faf255c4
diff --git a/FusionIIIT/applications/programme_curriculum/models.py b/FusionIIIT/applications/programme_curriculum/models.py
@@ -335,6 +335,7 @@ class Meta:
 
 
 
+
       def __self__(self):
             return '{} - {}'.format(self.course_id, self.instructor_id)
Original file line number	Diff line number	Diff line change
		@@ -335,6 +335,7 @@ class Meta:




		def __self__(self):
		return '{} - {}'.format(self.course_id, self.instructor_id)