fix: conflicts

2022-02-08 16:34:24 +05:30
parent 57c69a7d6c bf3a496ea3
commit e17637d27b
11 changed files with 76 additions and 35 deletions
--- a/school/lms/widgets/CourseCard.html
+++ b/school/lms/widgets/CourseCard.html
@@ -39,10 +39,11 @@
      {{ widgets.Avatar(member=course.get_instructor(), avatar_class="avatar-small") }}
      <a class="button-links" href="{{ get_profile_url(course.get_instructor().username) }}">
        <span class="course-instructor">
-          {{ course.get_instructor().full_name }}
+          {{ instructor.full_name }}
        </span>
      </a>
    </span>
+    {% endfor %}
    <span class="course-student-count">
      {% if course.get_students() | length %}
      <span class="vertically-center mr-4">