fix: conflicts

This commit is contained in:
pateljannat
2021-10-02 18:54:05 +05:30
4 changed files with 37 additions and 8 deletions

View File

@@ -17,4 +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
community.patches.v0_0.rename_chapter_and_lesson_doctype #30-09-2021