chore: conflicts

ParsimonyGit · Apr 16, 2023 · 98ed644 · 98ed644
1 parent 5d51103
commit 98ed644
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -434,11 +434,7 @@
  "icon": "fa fa-barcode",
  "idx": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-01-08 14:31:15.375996",
-=======
  "modified": "2023-04-14 15:58:46.139887",
->>>>>>> fb3271c624 (fix: unable to change `company` for manual `Serial No` entry)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial No",