chore: resolved conflicts

This commit is contained in:
Jannat Patel
2026-02-17 15:04:31 +05:30
33 changed files with 484 additions and 494 deletions

View File

@@ -18,7 +18,6 @@
<Link
doctype="User"
v-model="student"
:filters="{ ignore_user_type: 1 }"
placeholder=" "
:label="__('Student')"
:onCreate="