MIDNIGHT/frappe-lms
2
0
Fork 0
mirror of https://github.com/frappe/lms.git synced 2026-05-02 13:39:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Jannat Patel
2026-02-25 13:06:37 +05:30
committed by GitHub
parent a5e948bba8
commit 3a1a7db386
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
+3 -15
View File
@@ -116,13 +116,8 @@
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-10-07 16:52:04.162521",
"modified_by": "Administrator",
=======
"modified": "2026-02-25 12:36:40.110346",
"modified_by": "sayali@frappe.io",
>>>>>>> af5bce9e (fix: permission issue during quiz submission)
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Quiz Submission",
"owner": "Administrator",
@@ -143,20 +138,13 @@
"create": 1,
"email": 1,
"export": 1,
<<<<<<< HEAD
=======
"if_owner": 1,
>>>>>>> af5bce9e (fix: permission issue during quiz submission)
"print": 1,
"read": 1,
"report": 1,
"role": "LMS Student",
<<<<<<< HEAD
"share": 1
=======
"share": 1,
"write": 1
>>>>>>> af5bce9e (fix: permission issue during quiz submission)
"write": 1f
}
],
"sort_field": "modified",
@@ -164,4 +152,4 @@
"states": [],
"title_field": "member_name",
"track_changes": 1
}
}