fix: conflicts

This commit is contained in:
Jannat Patel
2022-02-22 11:18:57 +05:30
7 changed files with 111 additions and 67 deletions
+4
View File
@@ -2,6 +2,7 @@ import re
import frappe
from frappe.utils import flt, cint, cstr
from school.lms.md import markdown_to_html
import string
RE_SLUG_NOTALLOWED = re.compile("[^a-z0-9]+")
@@ -292,3 +293,6 @@ def get_initial_members(course):
def is_instructor(course):
return len(list(filter(lambda x: x.name == frappe.session.user, get_instructors(course)))) > 0
def convert_number_to_character(number):
return string.ascii_uppercase[number]
+1 -1
View File
@@ -57,7 +57,7 @@
</div>
<div>
<a class="button-links" href="{{get_profile_url(review.owner_details.username) }}">
<span class="review-author">
<span class="bold-heading">
{{ review.owner_details.full_name }}
</span>
</a>