From 3a1a7db3869dded4b775c272ded89477d5464b26 Mon Sep 17 00:00:00 2001
From: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Date: Wed, 25 Feb 2026 13:06:37 +0530
Subject: [PATCH] chore: resolved conflicts

---
 .../lms_quiz_submission.json                   | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
index e3a8cb5f..b358a254 100644
--- a/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
+++ b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
@@ -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
-}
\ No newline at end of file
+}