fix: conflicts

This commit is contained in:
pateljannat
2021-09-30 17:36:15 +05:30
27 changed files with 445 additions and 36 deletions

View File

@@ -17,3 +17,4 @@ execute:frappe.delete_doc("DocType", "Lessons")
execute:frappe.delete_doc("DocType", "Chapter")
execute:frappe.delete_doc("DocType", "Lesson")
execute:frappe.delete_doc("DocType", "LMS Topic")
community.patches.v0_0.rename_chapter_and_lesson_doctype #29-09-2021