chore: resolved conflicts

This commit is contained in:
Jannat Patel
2023-07-26 11:00:27 +05:30
10 changed files with 19 additions and 42 deletions

View File

@@ -486,11 +486,6 @@
frappe.boot.single_types = []
frappe.router = {
slug (name) {
return name.toLowerCase().replace(/ /g, "-");
}
}
let class_info = {{ class_info | json }};
</script>
{% endif %}