fix: conflicts

This commit is contained in:
Jannat Patel
2021-10-24 12:03:06 +05:30
parent f5af07086b
commit 050cfa494c
23 changed files with 478 additions and 154 deletions

View File

@@ -99,7 +99,7 @@
<img class="ml-2" src="/assets/school/icons/side-arrow-white.svg">
</a>
{% elif course.enable_certification %}
<div class="button is-primary {% if course.get_course_progress() != 100 %} hide {% endif %}" id="certification">
<div class="button is-primary {% if membership.progress != 100 %} hide {% endif %}" id="certification">
Get Certificate
</div>
{% endif %}