chore: conflicts

frappe · Nov 11, 2023 · 8fc1d45 · 8fc1d45
1 parent 0fac1de
commit 8fc1d45
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
@@ -208,11 +208,7 @@
  "image_field": "image",
  "links": [],
  "max_attachments": 5,
-<<<<<<< HEAD
- "modified": "2022-02-21 08:08:23.999236",
-=======
  "modified": "2023-11-09 12:17:28.339975",
->>>>>>> 779260fb49 (fix: make item field read-only in batch)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Batch",
@@ -229,6 +225,7 @@
    "read": 1,
    "report": 1,
    "role": "Item Manager",
+   "set_user_permissions": 1,
    "share": 1,
    "write": 1
   }